From c3b5b1739b7ef19d5ceea7a4f9ea64ff7cf4ea1a Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Mon, 31 Aug 2015 09:12:28 -0500 Subject: 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 Reviewed-on: https://chromium-review.googlesource.com/295198 Reviewed-by: Duncan Laurie --- power/skylake.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'power') 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; -- cgit v1.2.1