From 60c0372ba770590333f164c4066ee068c6a4f93d Mon Sep 17 00:00:00 2001 From: Ting Shen Date: Thu, 25 Jul 2019 20:10:01 +0800 Subject: jacuzzi: add extpower gpio jacuzzi has an AC_PRESENT pin, remove the custom callback and use EXTPOWER_GPIO to handle it. BUG=b:135895590 TEST=AC on/off in ec console reported correctly BRANCH=master Change-Id: I48110191a4d36eaa1ec3851d15562643e0e465be Signed-off-by: Ting Shen Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1718287 Reviewed-by: Yilun Lin Commit-Queue: Ting Shen Tested-by: Ting Shen --- board/jacuzzi/board.c | 12 ------------ board/jacuzzi/board.h | 4 ++++ board/jacuzzi/gpio.inc | 3 ++- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/board/jacuzzi/board.c b/board/jacuzzi/board.c index 6d6f722168..6f2450b09d 100644 --- a/board/jacuzzi/board.c +++ b/board/jacuzzi/board.c @@ -198,18 +198,6 @@ int board_discharge_on_ac(int enable) return charger_discharge_on_ac(enable); } -int extpower_is_present(void) -{ - /* - * The charger will indicate VBUS presence if we're sourcing 5V, - * so exclude such ports. - */ - if (board_vbus_source_enabled(0)) - return 0; - else - return tcpm_get_vbus_level(0); -} - int pd_snk_is_vbus_provided(int port) { /* TODO(b:138352732): read IT8801 GPIO EN_USBC_CHARGE_L */ diff --git a/board/jacuzzi/board.h b/board/jacuzzi/board.h index 08a7974032..dcede405f2 100644 --- a/board/jacuzzi/board.h +++ b/board/jacuzzi/board.h @@ -26,6 +26,10 @@ #define CONFIG_BC12_DETECT_PI3USB9201 +#define CONFIG_EXTPOWER_GPIO +#undef CONFIG_EXTPOWER_DEBOUNCE_MS +#define CONFIG_EXTPOWER_DEBOUNCE_MS 200 + #define CONFIG_USB_PD_TCPM_FUSB302 #define CONFIG_USB_PD_DISCHARGE_GPIO #define CONFIG_USB_PD_VBUS_MEASURE_NOT_PRESENT diff --git a/board/jacuzzi/gpio.inc b/board/jacuzzi/gpio.inc index 2cad7889b6..02bc372dfb 100644 --- a/board/jacuzzi/gpio.inc +++ b/board/jacuzzi/gpio.inc @@ -29,9 +29,10 @@ GPIO_INT(SPI1_NSS, PIN(A, 15), GPIO_INT_BOTH, spi_event) /* SPI_AP_EC_CS_L */ GPIO_INT(LID_OPEN, PIN(C, 5), GPIO_INT_BOTH, lid_interrupt) +GPIO_INT(AC_PRESENT, PIN(A, 6), GPIO_INT_BOTH, + extpower_interrupt) /* ACOK_OD */ /* Unimplemented interrupts */ -GPIO(ACOK_OD, PIN(A, 6), GPIO_INPUT) GPIO(KB_INT_ODL, PIN(A, 8), GPIO_INPUT) GPIO(BC12_EC_INT_ODL, PIN(C, 9), GPIO_INPUT) GPIO(ALS_RGB_INT_ODL, PIN(C, 10), GPIO_INPUT) -- cgit v1.2.1