From ebe586fb7846cfb85af6f46ea8610ac5f993f496 Mon Sep 17 00:00:00 2001 From: Ting Shen Date: Tue, 4 Aug 2020 18:12:23 +0800 Subject: asurada: support both rev0/1 AC_PRESENT pin The location of AC_PRESENT has changed in rev 1, to support both rev 0 and 1, the default AC_PRESENT is assigned to a placeholder pin when boot, and re-assign to the correct pin after ADC is accessible. BUG=b:162814191 TEST=See "AC on/off" triggered correctly on both rev 0 and rev 1 device. BRANCH=master Signed-off-by: Ting Shen Change-Id: I2d331b60a4a4420004fea19b0c446b1116816f9b Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2336661 Reviewed-by: Nicolas Boichat Commit-Queue: Ting Shen Tested-by: Ting Shen --- board/asurada/gpio.inc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'board/asurada/gpio.inc') diff --git a/board/asurada/gpio.inc b/board/asurada/gpio.inc index ad44055260..37899122a6 100644 --- a/board/asurada/gpio.inc +++ b/board/asurada/gpio.inc @@ -49,8 +49,10 @@ GPIO_INT(VOLUME_UP_L, PIN(D, 6), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt) /* EC_VOLUP_BTN_ODL */ /* Other interrupts */ -GPIO_INT(AC_PRESENT, PIN(M, 2), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, - extpower_interrupt) /* ACOK_OD */ +GPIO_INT(EC_GPM2, PIN(M, 2), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, + extpower_interrupt) /* AC_OK / AC_PRESENT in rev0 */ +GPIO_INT(EC_GPE5, PIN(E, 5), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, + extpower_interrupt) /* AC_OK / AC_PRESENT in rev1+ */ GPIO_INT(UART1_RX, PIN(B, 0), GPIO_INT_FALLING, uart_deepsleep_interrupt) /* UART_DEBUG_TX_EC_RX */ GPIO_INT(WP, PIN(I, 4), GPIO_INT_BOTH, @@ -132,6 +134,9 @@ UNIMPLEMENTED(PCH_SCI_L) UNIMPLEMENTED(PCH_WAKE_L) UNIMPLEMENTED(PCH_PLTRST_L) +/* Fake AC_PRESENT pin before board rev is determined */ +UNIMPLEMENTED(AC_PRESENT_PLACEHOLDER) + #define UNIMPLEMENTED_GPIO(name, pin) UNIMPLEMENTED(name) UNIMPLEMENTED_GPIO(SET_VMC_VOLT_AT_1V8, PIN(D, 4)) @@ -143,8 +148,6 @@ UNIMPLEMENTED_GPIO(LED3_SUB_ODL, PIN(A, 2)) UNIMPLEMENTED_GPIO(PACKET_MODE_EN, PIN(A, 3)) /* b/160218054: behavior not defined */ UNIMPLEMENTED_GPIO(USB_A0_FAULT_ODL, PIN(A, 7)) -/* TODO: ACOK_OD in P1 */ -UNIMPLEMENTED_GPIO(EC_GPE5, PIN(E, 5)) UNIMPLEMENTED_GPIO(CHARGER_PROCHOT_ODL, PIN(C, 3)) UNIMPLEMENTED_GPIO(USB_C0_FRS_EN, PIN(H, 3)) UNIMPLEMENTED_GPIO(PG_MT6315_GPU_ODL, PIN(H, 6)) -- cgit v1.2.1