summaryrefslogtreecommitdiff
path: root/chip
diff options
context:
space:
mode:
authorPhilip Chen <philipchen@google.com>2017-04-06 17:43:16 -0700
committerchrome-bot <chrome-bot@chromium.org>2017-04-14 13:49:31 -0700
commit20c439be209a9cc0bb949ad21f289c453126395f (patch)
treeb7e5d1a9cab98819b78b952edea09b678f598bd2 /chip
parentc487e18a3f203dc8793e884730eb66b2706deb26 (diff)
downloadchrome-ec-20c439be209a9cc0bb949ad21f289c453126395f.tar.gz
system: Shutdown AP before entering hibernate mode
BUG=chromium:702451 BRANCH=none TEST=manually test on gru: confirm 'Alt+VolUp+h' puts gru in hibernate mode and AC plug-in wakes it up. Change-Id: I3e1134b866dea5d3cc61f9b3dad31c3ff0bd9096 Reviewed-on: https://chromium-review.googlesource.com/470787 Commit-Ready: Philip Chen <philipchen@chromium.org> Tested-by: Philip Chen <philipchen@chromium.org> Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
Diffstat (limited to 'chip')
-rw-r--r--chip/host/system.c2
-rw-r--r--chip/ish/system.c2
-rw-r--r--chip/it83xx/system.c2
-rw-r--r--chip/lm4/system.c2
-rw-r--r--chip/mec1322/system.c2
-rw-r--r--chip/npcx/system.c2
-rw-r--r--chip/nrf51/system.c2
-rw-r--r--chip/stm32/system.c2
8 files changed, 8 insertions, 8 deletions
diff --git a/chip/host/system.c b/chip/host/system.c
index 3820048fad..4acb19a2cd 100644
--- a/chip/host/system.c
+++ b/chip/host/system.c
@@ -150,7 +150,7 @@ test_mockable void system_reset(int flags)
emulator_reboot();
}
-test_mockable void system_hibernate(uint32_t seconds, uint32_t microseconds)
+void chip_hibernate(uint32_t seconds, uint32_t microseconds)
{
uint32_t i;
diff --git a/chip/ish/system.c b/chip/ish/system.c
index 7110e85645..7fe3860d9a 100644
--- a/chip/ish/system.c
+++ b/chip/ish/system.c
@@ -96,7 +96,7 @@ uint32_t system_get_scratchpad(void)
return 0;
}
-void system_hibernate(uint32_t seconds, uint32_t microseconds)
+void chip_hibernate(uint32_t seconds, uint32_t microseconds)
{
}
diff --git a/chip/it83xx/system.c b/chip/it83xx/system.c
index 8ba3a970c1..e9b7f37e45 100644
--- a/chip/it83xx/system.c
+++ b/chip/it83xx/system.c
@@ -18,7 +18,7 @@
#include "version.h"
#include "watchdog.h"
-void system_hibernate(uint32_t seconds, uint32_t microseconds)
+void chip_hibernate(uint32_t seconds, uint32_t microseconds)
{
#ifdef CONFIG_HOSTCMD_PD
/* Inform the PD MCU that we are going to hibernate. */
diff --git a/chip/lm4/system.c b/chip/lm4/system.c
index 684b520dae..4ddfef4e35 100644
--- a/chip/lm4/system.c
+++ b/chip/lm4/system.c
@@ -381,7 +381,7 @@ static void hibernate(uint32_t seconds, uint32_t microseconds, uint32_t flags)
__enter_hibernate(hibctl | LM4_HIBCTL_HIBREQ);
}
-void system_hibernate(uint32_t seconds, uint32_t microseconds)
+void chip_hibernate(uint32_t seconds, uint32_t microseconds)
{
/* Flush console before hibernating */
cflush();
diff --git a/chip/mec1322/system.c b/chip/mec1322/system.c
index 4b2738e969..ba4b574b06 100644
--- a/chip/mec1322/system.c
+++ b/chip/mec1322/system.c
@@ -215,7 +215,7 @@ uint32_t system_get_scratchpad(void)
return MEC1322_VBAT_RAM(HIBDATA_INDEX_SCRATCHPAD);
}
-void system_hibernate(uint32_t seconds, uint32_t microseconds)
+void chip_hibernate(uint32_t seconds, uint32_t microseconds)
{
int i;
diff --git a/chip/npcx/system.c b/chip/npcx/system.c
index 335cb9a44a..156075e278 100644
--- a/chip/npcx/system.c
+++ b/chip/npcx/system.c
@@ -596,7 +596,7 @@ void system_enable_hib_interrupt(void)
task_enable_irq(NPCX_IRQ_MTC_WKINTAD_0);
}
-void system_hibernate(uint32_t seconds, uint32_t microseconds)
+void chip_hibernate(uint32_t seconds, uint32_t microseconds)
{
/* Flush console before hibernating */
cflush();
diff --git a/chip/nrf51/system.c b/chip/nrf51/system.c
index 61bd2311a8..e2891831a0 100644
--- a/chip/nrf51/system.c
+++ b/chip/nrf51/system.c
@@ -31,7 +31,7 @@ const char *system_get_chip_revision(void)
return "";
}
-void system_hibernate(uint32_t seconds, uint32_t microseconds)
+void chip_hibernate(uint32_t seconds, uint32_t microseconds)
{
/* Flush console before hibernating */
cflush();
diff --git a/chip/stm32/system.c b/chip/stm32/system.c
index b81dc0055c..43461579d7 100644
--- a/chip/stm32/system.c
+++ b/chip/stm32/system.c
@@ -103,7 +103,7 @@ void __no_hibernate(uint32_t seconds, uint32_t microseconds)
void __enter_hibernate(uint32_t seconds, uint32_t microseconds)
__attribute__((weak, alias("__no_hibernate")));
-void system_hibernate(uint32_t seconds, uint32_t microseconds)
+void chip_hibernate(uint32_t seconds, uint32_t microseconds)
{
#ifdef CONFIG_HOSTCMD_PD
/* Inform the PD MCU that we are going to hibernate. */