scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2025-12-27 18:25:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Veyron: Fix force power-off

Browse Source 
I readded the code that armed the power_off_deadline. The force power-off should
be controlled fully from the EC now.

BUG=None
TEST=When in S3/S0, hold the power button for 8 seconds; the system should shutdown.
BRANCH=None

Change-Id: I848ce6757e497c15296aa4eae9c05133950b4e45
Signed-off-by: Alexandru M Stan <amstan@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/213249
Reviewed-by: Yung-chieh Lo <yjlou@chromium.org>
This commit is contained in:
Alexandru M Stan
2014-08-20 10:18:22 -07:00
committed by chrome-internal-fetch
parent f7f9783e30
commit 5641bbfe3b
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
power/rockchip.c
View File

@@ -50,7 +50,7 @@
#define IN_SUSPEND POWER_SIGNAL_MASK(RK_SUSPEND_ASSERTED)
/* Long power key press to force shutdown */
#define DELAY_FORCE_SHUTDOWN (10200 * MSEC) /* 10.2 seconds */
#define DELAY_FORCE_SHUTDOWN (8 * SECOND)
/*
* The minimum time to assert the PMIC PWRON pin is 20ms.
@@ -73,7 +73,7 @@
* into the inner loop, waiting for next event to occur (power button
* press or power good == 0).
*/
#define DELAY_SHUTDOWN_ON_POWER_HOLD (10200 * MSEC) /* 10.2 seconds */
#define DELAY_SHUTDOWN_ON_POWER_HOLD (8 * SECOND)
/*
* The hold time for pulling down the PMIC_WARM_RESET_L pin so that
@@ -189,6 +189,8 @@ static int check_for_power_off_event(void)
power_off_deadline.val = now.val + DELAY_FORCE_SHUTDOWN;
CPRINTS("power waiting for long press %u",
power_off_deadline.le.lo);
/* Ensure we will wake up to check the power key */
timer_arm(power_off_deadline, TASK_ID_CHIPSET);
} else if (timestamp_expired(power_off_deadline, &now)) {
power_off_deadline.val = 0;
CPRINTS("power off after long press now=%u, %u",