diff options
| author | Wai-Hong Tam <waihong@google.com> | 2020-08-12 15:13:42 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-08-13 07:42:18 +0000 |
| commit | 4b39e18c51890d228ed2c201da84ea4034ebb45c (patch) | |
| tree | 1132b21b8576babe19989dd9f10ea3f9b130652c | |
| parent | 27830a2e832267fef1cb077e6fa008051366065e (diff) | |
| download | chrome-ec-4b39e18c51890d228ed2c201da84ea4034ebb45c.tar.gz | |
sc7180: Don't neglect the delay in a forced shutdown
In a forced shutdown, it just waits the POWER_GOOD drop to low, but not
wait the SYSTEM_POWER_ON_DELAY. If AP requests EC reboot at shutdown,
EC reboots immediately right after turns off the switchcap. Better to
delay a bit.
BRANCH=None
BUG=b:156981868, b:163613549
TEST=After switching from normal to dev mode, AP boots normally.
Change-Id: Iae300aa03dd0a991f62742159613377fe2388760
Signed-off-by: Wai-Hong Tam <waihong@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2352440
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
| -rw-r--r-- | power/sc7180.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/power/sc7180.c b/power/sc7180.c index 77c3a3e7f1..bff904f9c8 100644 --- a/power/sc7180.c +++ b/power/sc7180.c @@ -429,12 +429,12 @@ static int set_system_power(int enable) ret = wait_switchcap_power_good(enable); - if (enable) { - usleep(SYSTEM_POWER_ON_DELAY); - } else { + if (!enable) { /* Ensure POWER_GOOD drop to low if it is a forced shutdown */ ret |= wait_pmic_pwron(0, FORCE_OFF_RESPONSE_TIMEOUT); } + usleep(SYSTEM_POWER_ON_DELAY); + return ret; } |