diff options
| author | Vadim Bendebury <vbendeb@google.com> | 2016-06-29 14:45:27 -0700 |
|---|---|---|
| committer | Vadim Bendebury <vbendeb@chromium.org> | 2016-06-29 22:10:25 +0000 |
| commit | 734d834becd3f8e08cdc094882aed447c6275b9f (patch) | |
| tree | 210046d4b6ba2ff44e47fbe7f38fa1a6460db040 | |
| parent | 535448d29ec9751b0dffa8aba67b32ad05729974 (diff) | |
| download | chrome-ec-734d834becd3f8e08cdc094882aed447c6275b9f.tar.gz | |
Revert "Cr50: Set the default idle action to Sleep"
This reverts commit 9a644c429af9f299445962892666685233cb0a1b.
BUG=chrome-os-partner:54916
Change-Id: I4e92258412d79d4962049552e911fb4ab2cfc914
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/357321
| -rw-r--r-- | chip/g/idle.c | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/chip/g/idle.c b/chip/g/idle.c index 1686474ba9..dc003d3eef 100644 --- a/chip/g/idle.c +++ b/chip/g/idle.c @@ -12,17 +12,13 @@ /* What to do when we're just waiting */ static enum { - DONT_KNOW, - IDLE_WFI, + IDLE_WFI, /* default */ IDLE_SLEEP, IDLE_DEEP_SLEEP, NUM_CHOICES } idle_action; -#define IDLE_DEFAULT IDLE_SLEEP - static const char const *idle_name[] = { - "invalid", "wfi", "sleep", "deep sleep", @@ -35,7 +31,7 @@ static int command_idle(int argc, char **argv) if (argc > 1) { c = tolower(argv[1][0]); - for (i = 1; i < ARRAY_SIZE(idle_name); i++) + for (i = 0; i < ARRAY_SIZE(idle_name); i++) if (idle_name[i][0] == c) { idle_action = i; break; @@ -133,17 +129,10 @@ void __idle(void) { int sleep_ok, sleep_delay_passed; - /* - * This register is preserved across soft reboots, but not hard. It - * defaults to zero, which is how we can tell whether this is the - * preserved value or not. We only need to remember it because we might - * change it with the console command. - */ + /* Preserved across soft reboots, but not hard */ idle_action = GREG32(PMU, PWRDN_SCRATCH17); - if (idle_action == DONT_KNOW || idle_action >= NUM_CHOICES) { - idle_action = IDLE_DEFAULT; - GREG32(PMU, PWRDN_SCRATCH17) = idle_action; - } + if (idle_action >= NUM_CHOICES) + idle_action = IDLE_WFI; while (1) { |