diff options
| author | Aaron Durbin <adurbin@chromium.org> | 2015-08-31 09:12:28 -0500 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2015-08-31 12:29:30 -0700 |
| commit | c3b5b1739b7ef19d5ceea7a4f9ea64ff7cf4ea1a (patch) | |
| tree | 7f8610d7fb07d59754d92518719a9ad832e5c4e9 /power | |
| parent | fa0c85b6c9c36cd677782eb97907162a371fbef2 (diff) | |
| download | chrome-ec-c3b5b1739b7ef19d5ceea7a4f9ea64ff7cf4ea1a.tar.gz | |
skylake: allow power button power ons in S5 after apshutdown
On skylake the apshutdown command holds the power button asserted until
the power state machine decides to deassert the power button. Previously
this check was taking place in G3 state. As such when the board waited
in S5 for 10 secs one couldn't re-power on the system. To alleviate that
move the logic for power button deassertion into the S5 state.
BUG=chrome-os-partner:44532
BRANCH=None
TEST=Used apshutdown. When device got to S5 power noted another
powerb command would bring the system back up instead of waiting
to enter G3 power state.
Change-Id: I9989b27bd48819d7c3e5efd071b0327c38fe91e2
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/295198
Reviewed-by: Duncan Laurie <dlaurie@chromium.org>
Diffstat (limited to 'power')
| -rw-r--r-- | power/skylake.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/power/skylake.c b/power/skylake.c index d6e706b94f..76f14ea49b 100644 --- a/power/skylake.c +++ b/power/skylake.c @@ -135,13 +135,13 @@ static enum power_state _power_handle_state(enum power_state state) switch (state) { case POWER_G3: + break; + + case POWER_S5: if (forcing_shutdown) { power_button_pch_release(); forcing_shutdown = 0; } - break; - - case POWER_S5: if (gpio_get_level(GPIO_PCH_SLP_S4_L) == 1) return POWER_S5S3; /* Power up to next state */ break; |