diff options
| author | Eric Yilun Lin <yllin@chromium.org> | 2020-05-04 14:14:51 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-05-11 16:24:49 +0000 |
| commit | 8f44962b5a5e65e05191a06061bc11871efc2212 (patch) | |
| tree | 1284a8f2e7202e559d773ce834f78abea1856fee | |
| parent | 2cc64405ddbbac298d276b9ee52f73490e03415f (diff) | |
| download | chrome-ec-8f44962b5a5e65e05191a06061bc11871efc2212.tar.gz | |
asurada: configure hibernate wake source.
We have three wake sources: power button, lid open, and ACOK.
it81202 doesn't need EC_RST_ODL as a wake source.
BRANCH=master
BUG=b:150341271
TEST=test power button, lid open event can wake the system up.
Change-Id: I4f919de661e9b2ee6caaf172f008cb608ea02b64
Signed-off-by: Eric Yilun Lin <yllin@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2178693
Reviewed-by: Ting Shen <phoenixshen@chromium.org>
| -rw-r--r-- | board/asurada/board.c | 4 | ||||
| -rw-r--r-- | board/asurada/gpio.inc | 12 |
2 files changed, 9 insertions, 7 deletions
diff --git a/board/asurada/board.c b/board/asurada/board.c index 9b773c6953..54016537c5 100644 --- a/board/asurada/board.c +++ b/board/asurada/board.c @@ -51,7 +51,9 @@ BUILD_ASSERT(ARRAY_SIZE(pwm_channels) == PWM_CH_COUNT); /* Wake-up pins for hibernate */ const enum gpio_signal hibernate_wake_pins[] = { - GPIO_POWER_BUTTON_L, GPIO_LID_OPEN + GPIO_AC_PRESENT, + GPIO_LID_OPEN, + GPIO_POWER_BUTTON_L, }; const int hibernate_wake_pins_used = ARRAY_SIZE(hibernate_wake_pins); diff --git a/board/asurada/gpio.inc b/board/asurada/gpio.inc index e82d515422..1d24bed6d8 100644 --- a/board/asurada/gpio.inc +++ b/board/asurada/gpio.inc @@ -9,10 +9,10 @@ * Note: Those with interrupt handlers must be declared first. */ /* Wake Source interrupts */ -GPIO_INT(POWER_BUTTON_L, PIN(E, 4), GPIO_INT_BOTH | GPIO_PULL_UP, - power_button_interrupt) /* H1_EC_PWR_BTN_ODL */ -GPIO_INT(LID_OPEN, PIN(E, 2), GPIO_INT_BOTH | GPIO_PULL_DOWN, - lid_interrupt) +GPIO_INT(POWER_BUTTON_L, PIN(E, 4), GPIO_INT_BOTH | GPIO_PULL_UP | + GPIO_HIB_WAKE_HIGH, power_button_interrupt) /* H1_EC_PWR_BTN_ODL */ +GPIO_INT(LID_OPEN, PIN(E, 2), GPIO_INT_BOTH | GPIO_PULL_DOWN | + GPIO_HIB_WAKE_HIGH, lid_interrupt) GPIO_INT(TABLET_MODE_L, PIN(J, 7), GPIO_INT_BOTH | GPIO_PULL_UP, gmr_tablet_switch_isr) @@ -35,7 +35,7 @@ GPIO_INT(PMIC_EC_PWRGD, PIN(F, 3), /* Volume button interrupts */ /* Other interrupts */ -GPIO_INT(AC_PRESENT, PIN(M, 2), GPIO_INT_BOTH, +GPIO_INT(AC_PRESENT, PIN(M, 2), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, extpower_interrupt) /* ACOK_OD */ GPIO_INT(UART1_RX, PIN(B, 0), GPIO_INT_FALLING | GPIO_PULL_DOWN, uart_deepsleep_interrupt) /* UART_DEBUG_TX_EC_RX */ @@ -99,6 +99,7 @@ ALTERNATE(PIN_MASK(A, 0x0F), 1, MODULE_PWM, 0) /* PWM 0~3 */ ALTERNATE(PIN_MASK(I, 0xEF), 0, MODULE_ADC, 0) /* ADC 0,1,2,3,5,6,7 */ /* Power Switch Logic (PSL) inputs */ +GPIO(EC_RST_ODL, PIN(L, 1), GPIO_INPUT) /* Unimplemented Pins */ UNIMPLEMENTED(PCH_SMI_L) @@ -114,7 +115,6 @@ UNIMPLEMENTED_GPIO(EC_GPM3, PIN(M, 3)) UNIMPLEMENTED_GPIO(AP_SPI_EC_MISO_R, PIN(M, 1)) UNIMPLEMENTED_GPIO(AP_SPI_EC_MOSI, PIN(M, 0)) UNIMPLEMENTED_GPIO(AP_SPI_EC_CLK, PIN(M, 4)) -UNIMPLEMENTED_GPIO(EC_RST_ODL, PIN(L, 1)) UNIMPLEMENTED_GPIO(SET_VMC_VOLT_AT_1V8, PIN(D, 4)) UNIMPLEMENTED_GPIO(USB_C0_PPC_INT_ODL, PIN(D, 1)) UNIMPLEMENTED_GPIO(EN_PP3000_VMC_PMU, PIN(D, 2)) |