diff options
| author | Shawn Nematbakhsh <shawnn@chromium.org> | 2016-10-14 14:41:56 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2016-12-01 19:58:55 -0800 |
| commit | 0701e32446603b513e79b55e7c06bd733d140883 (patch) | |
| tree | 73eeaf2b583530aa0bed452698a45f3b0cb79845 /power | |
| parent | 87f871d1ae65eb6cc26583e570d4f58a7f94d81b (diff) | |
| download | chrome-ec-0701e32446603b513e79b55e7c06bd733d140883.tar.gz | |
power: rk3399: Wake from S3 on power button press rather than shutdown
BUG=chrome-os-partner:58599
BRANCH=gru
TEST=Boot kevin, go to S3, verify power button wakes. Hold power button
in S3, verify device wakes and then shuts down. Go to S3, close lid,
press power button, and verify no wake occurs.
Change-Id: I4fa2e4967babc18cea9b5ffc7cec264b6f2fa8e3
Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/399518
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
(cherry picked from commit 97bdf83b41834c072c5d1be516c8186c7911cee3)
Reviewed-on: https://chromium-review.googlesource.com/415489
Commit-Ready: Shawn N <shawnn@chromium.org>
Tested-by: Shawn N <shawnn@chromium.org>
Reviewed-by: Shawn N <shawnn@chromium.org>
Diffstat (limited to 'power')
| -rw-r--r-- | power/rk3399.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/power/rk3399.c b/power/rk3399.c index 7aab83c2d0..960da80b3a 100644 --- a/power/rk3399.c +++ b/power/rk3399.c @@ -366,13 +366,7 @@ static void power_button_changed(void) /* Power up from off */ chipset_exit_hard_off(); - else if (!chipset_in_state(CHIPSET_STATE_ON)) { - /* Power down immediately from S3 */ - force_shutdown(); - return; - } - - /* Delayed power down from S0, cancel on PB release */ + /* Delayed power down from S0/S3, cancel on PB release */ hook_call_deferred(&force_shutdown_data, FORCED_SHUTDOWN_DELAY); } else { |