diff options
author | Daisuke Nojiri <dnojiri@chromium.org> | 2020-07-31 17:20:38 +0000 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2020-08-01 00:12:19 +0000 |
commit | 744a611d80219aa430501e2a1923e2d06af7fe0a (patch) | |
tree | d129f1a8027faee950f2b7036cd11d77ead26771 /board | |
parent | eaffee8a2567be9be30a2290456dc3d4c0f39147 (diff) | |
download | chrome-ec-744a611d80219aa430501e2a1923e2d06af7fe0a.tar.gz |
Revert "power: Clear AP_IDLE when waking up by PB or LID"
This reverts commit 27ee378bb78a299a0983379be83eb6d55860b4ae.
Reason for revert: b/162508724
A wake-up source from hibernation needs to be determined only by RO. Reverting back to the original implementation: CL:2236589.
Original change's description:
> power: Clear AP_IDLE when waking up by PB or LID
>
> Currently, AP_IDLE is cleared when EC wakes up by the power button or
> the lid open.
>
> This patch extends the logic from CONFIG_EXTPOWER_GPIO to
> CONFIG_EXTPOWER so that the bug (chromium:1073960) can be also fixed
> on the boards using non-GPIO method for extpower_is_present.
>
> Tested as follows on Trembyle:
> 1. Put DUT in hibernation.
> 2. Wake up DUT and observe:
> a. When waking up by power button, AP is turned on.
> b. When waking up by lid open, AP is turned on.
> c. When waking up by AC, AP is left idle.
>
> BUG=b:157077589, chromium:1073960, b:159350276
> BRANCH=none
> TEST=See above.
>
> Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
> Change-Id: I944aaac036ce58659e81b7021e52a3291f31e951
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2283946
> Reviewed-by: Jett Rink <jettrink@chromium.org>
Bug: b:157077589
Bug: chromium:1073960
Bug: b:159350276
Bug: b:162508724
Change-Id: Iaf9d0af2ca8c48bbf2529c4ba05493837dd76287
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2333106
Tested-by: Daisuke Nojiri <dnojiri@chromium.org>
Auto-Submit: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Commit-Queue: Daisuke Nojiri <dnojiri@chromium.org>
Diffstat (limited to 'board')
-rw-r--r-- | board/boten/gpio.inc | 1 | ||||
-rw-r--r-- | board/drawcia/gpio.inc | 1 | ||||
-rw-r--r-- | board/madoo/gpio.inc | 1 | ||||
-rw-r--r-- | board/magolor/gpio.inc | 1 | ||||
-rw-r--r-- | board/waddledee/gpio.inc | 1 | ||||
-rw-r--r-- | board/waddledoo/gpio.inc | 1 | ||||
-rw-r--r-- | board/wheelie/gpio.inc | 1 |
7 files changed, 7 insertions, 0 deletions
diff --git a/board/boten/gpio.inc b/board/boten/gpio.inc index 8ce426b2ab..b73f53c091 100644 --- a/board/boten/gpio.inc +++ b/board/boten/gpio.inc @@ -62,6 +62,7 @@ GPIO(ALL_SYS_PWRGD, PIN(B, 7), GPIO_OUT_LOW) GPIO(EN_SLP_Z, PIN(K, 3), GPIO_OUT_LOW) /* Required for icelake chipset code, but implemented through other means for dedede */ +UNIMPLEMENTED(AC_PRESENT) UNIMPLEMENTED(PG_EC_DSW_PWROK) UNIMPLEMENTED(PG_EC_ALL_SYS_PWRGD) diff --git a/board/drawcia/gpio.inc b/board/drawcia/gpio.inc index 0f80d6443c..4c709c72c3 100644 --- a/board/drawcia/gpio.inc +++ b/board/drawcia/gpio.inc @@ -63,6 +63,7 @@ GPIO(ALL_SYS_PWRGD, PIN(B, 7), GPIO_OUT_LOW) GPIO(EN_SLP_Z, PIN(K, 3), GPIO_OUT_LOW) /* Required for icelake chipset code, but implemented through other means for dedede */ +UNIMPLEMENTED(AC_PRESENT) UNIMPLEMENTED(PG_EC_DSW_PWROK) UNIMPLEMENTED(PG_EC_ALL_SYS_PWRGD) diff --git a/board/madoo/gpio.inc b/board/madoo/gpio.inc index 0e0f5c216e..4f75cfe4a0 100644 --- a/board/madoo/gpio.inc +++ b/board/madoo/gpio.inc @@ -96,6 +96,7 @@ GPIO(EC_BATTERY_PRES_ODL, PIN(E, 1), GPIO_INPUT) * Waddledoo doesn't have these physical pins coming to the EC but uses other * logic. */ +UNIMPLEMENTED(AC_PRESENT) UNIMPLEMENTED(PG_EC_DSW_PWROK) UNIMPLEMENTED(PG_EC_ALL_SYS_PWRGD) diff --git a/board/magolor/gpio.inc b/board/magolor/gpio.inc index 1da5624b0a..2358addc21 100644 --- a/board/magolor/gpio.inc +++ b/board/magolor/gpio.inc @@ -96,6 +96,7 @@ GPIO(EC_BATTERY_PRES_ODL, PIN(E, 1), GPIO_INPUT) * Waddledoo doesn't have these physical pins coming to the EC but uses other * logic. */ +UNIMPLEMENTED(AC_PRESENT) UNIMPLEMENTED(PG_EC_DSW_PWROK) UNIMPLEMENTED(PG_EC_ALL_SYS_PWRGD) diff --git a/board/waddledee/gpio.inc b/board/waddledee/gpio.inc index 63e1843d00..612e3f0f5d 100644 --- a/board/waddledee/gpio.inc +++ b/board/waddledee/gpio.inc @@ -64,6 +64,7 @@ GPIO(ALL_SYS_PWRGD, PIN(B, 7), GPIO_OUT_LOW) GPIO(EN_SLP_Z, PIN(K, 3), GPIO_OUT_LOW) /* Required for icelake chipset code, but implemented through other means for dedede */ +UNIMPLEMENTED(AC_PRESENT) UNIMPLEMENTED(PG_EC_DSW_PWROK) UNIMPLEMENTED(PG_EC_ALL_SYS_PWRGD) diff --git a/board/waddledoo/gpio.inc b/board/waddledoo/gpio.inc index 0e0f5c216e..4f75cfe4a0 100644 --- a/board/waddledoo/gpio.inc +++ b/board/waddledoo/gpio.inc @@ -96,6 +96,7 @@ GPIO(EC_BATTERY_PRES_ODL, PIN(E, 1), GPIO_INPUT) * Waddledoo doesn't have these physical pins coming to the EC but uses other * logic. */ +UNIMPLEMENTED(AC_PRESENT) UNIMPLEMENTED(PG_EC_DSW_PWROK) UNIMPLEMENTED(PG_EC_ALL_SYS_PWRGD) diff --git a/board/wheelie/gpio.inc b/board/wheelie/gpio.inc index abd18ecbe3..80f6a63a64 100644 --- a/board/wheelie/gpio.inc +++ b/board/wheelie/gpio.inc @@ -64,6 +64,7 @@ GPIO(ALL_SYS_PWRGD, PIN(B, 7), GPIO_OUT_LOW) GPIO(EN_SLP_Z, PIN(K, 3), GPIO_OUT_LOW) /* Required for icelake chipset code, but implemented through other means for dedede */ +UNIMPLEMENTED(AC_PRESENT) UNIMPLEMENTED(PG_EC_DSW_PWROK) UNIMPLEMENTED(PG_EC_ALL_SYS_PWRGD) |