diff options
| author | Caveh Jalali <caveh@chromium.org> | 2018-08-27 23:08:53 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-08-30 09:53:03 -0700 |
| commit | ea4ddeee3c6dd9dc796997df781cc5899027c4f7 (patch) | |
| tree | a18768bc4753c1be267379074142b9858392eead | |
| parent | 038912cff376e3163167bb811ac86e56143abe94 (diff) | |
| download | chrome-ec-ea4ddeee3c6dd9dc796997df781cc5899027c4f7.tar.gz | |
atlas: add ACOK as wake-from-hibernate source
this enables the system to wake up from hibernate when charging power
is applied over one of the USB-C ports.
BUG=b:113543019
BRANCH=none
TEST=verified atlas wakes from hibernate on 1st AC-in
Change-Id: Ib9e724f38987c0a0798aef6d8fe6e6d73bb07809
Signed-off-by: Caveh Jalali <caveh@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1194998
Commit-Ready: caveh jalali <caveh@chromium.org>
Tested-by: caveh jalali <caveh@chromium.org>
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
Reviewed-by: caveh jalali <caveh@chromium.org>
| -rw-r--r-- | board/atlas/board.c | 4 | ||||
| -rw-r--r-- | board/atlas/gpio.inc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/board/atlas/board.c b/board/atlas/board.c index 708ff17269..09cb8c3a25 100644 --- a/board/atlas/board.c +++ b/board/atlas/board.c @@ -113,9 +113,9 @@ BUILD_ASSERT(ARRAY_SIZE(pwm_channels) == PWM_CH_COUNT); /* Hibernate wake configuration */ const enum gpio_signal hibernate_wake_pins[] = { - GPIO_AC_PRESENT, + GPIO_ROP_EC_ACOK, GPIO_LID_OPEN, - GPIO_POWER_BUTTON_L, + GPIO_MECH_PWR_BTN_ODL, }; const int hibernate_wake_pins_used = ARRAY_SIZE(hibernate_wake_pins); diff --git a/board/atlas/gpio.inc b/board/atlas/gpio.inc index 7f2acd098f..1bb52ff67e 100644 --- a/board/atlas/gpio.inc +++ b/board/atlas/gpio.inc @@ -111,7 +111,7 @@ GPIO(NC_GPIOA7, PIN(A, 7), GPIO_INPUT | GPIO_PULL_UP) GPIO(NC_GPIOB0, PIN(B, 0), GPIO_INPUT | GPIO_PULL_UP) /* Power Switch Logic (PSL) inputs */ -ALTERNATE(PIN_MASK(0, 0x02), 0, MODULE_PMU, 0) /* PSL3&GPI01 */ +ALTERNATE(PIN_MASK(0, 0x03), 0, MODULE_PMU, 0) /* PSL3&GPI01, PSL2&GPI00 */ ALTERNATE(PIN_MASK(D, 0x04), 0, MODULE_PMU, 0) /* GPIOD2 */ /* gpio alternate functions */ |