diff options
| author | Sam McNally <sammc@chromium.org> | 2023-02-13 12:53:02 +1100 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2023-02-15 00:28:23 +0000 |
| commit | c407ef1ab6ccd1e750feab802121821e1865e4a7 (patch) | |
| tree | e4c29a158eb0313794c15daf7551341d60eb190c | |
| parent | d5bcaf338dc6ed29b782dd373cd7173095b31040 (diff) | |
| download | chrome-ec-c407ef1ab6ccd1e750feab802121821e1865e4a7.tar.gz | |
dibbi: Invert BJ_ADP_PRESENT_L.
BJ_ADP_PRESENT is active-high now, so rename and invert the logic for
anything depending on its value.
BUG=b:268309238
TEST=Barrel-jack adapter is correctly detected
BRANCH=none
Change-Id: I37116ab3501c8aa30a8cc848be40a1ee9e107821
Signed-off-by: Sam McNally <sammc@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4240906
Reviewed-by: Peter Marheine <pmarheine@chromium.org>
| -rw-r--r-- | board/dibbi/board.c | 14 | ||||
| -rw-r--r-- | board/dibbi/gpio.inc | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/board/dibbi/board.c b/board/dibbi/board.c index 6530167596..0d96b89b04 100644 --- a/board/dibbi/board.c +++ b/board/dibbi/board.c @@ -147,7 +147,7 @@ void board_init(void) { int on; - gpio_enable_interrupt(GPIO_BJ_ADP_PRESENT_L); + gpio_enable_interrupt(GPIO_BJ_ADP_PRESENT); /* Enable PPC interrupt */ gpio_enable_interrupt(GPIO_USB_C0_FAULT_L); @@ -250,7 +250,7 @@ static int8_t bj_adp_connected = -1; static void adp_connect_deferred(void) { const struct charge_port_info *pi; - int connected = !gpio_get_level(GPIO_BJ_ADP_PRESENT_L); + int connected = gpio_get_level(GPIO_BJ_ADP_PRESENT); /* Debounce */ if (connected == bj_adp_connected) @@ -315,15 +315,15 @@ int board_set_active_charge_port(int port) case CHARGE_PORT_TYPEC0: ppc_vbus_sink_enable(USBC_PORT_C0, 1); gpio_set_level(GPIO_EN_PPVAR_BJ_ADP_OD, 1); - gpio_enable_interrupt(GPIO_BJ_ADP_PRESENT_L); + gpio_enable_interrupt(GPIO_BJ_ADP_PRESENT); break; case CHARGE_PORT_BARRELJACK: /* Make sure BJ adapter is sourcing power */ - if (gpio_get_level(GPIO_BJ_ADP_PRESENT_L)) + if (!gpio_get_level(GPIO_BJ_ADP_PRESENT)) return EC_ERROR_INVAL; gpio_set_level(GPIO_EN_PPVAR_BJ_ADP_OD, 0); ppc_vbus_sink_enable(USBC_PORT_C0, 1); - gpio_disable_interrupt(GPIO_BJ_ADP_PRESENT_L); + gpio_disable_interrupt(GPIO_BJ_ADP_PRESENT); break; default: return EC_ERROR_INVAL; @@ -345,8 +345,8 @@ static void board_charge_manager_init(void) charge_manager_update_charge(j, i, NULL); } - port = gpio_get_level(GPIO_BJ_ADP_PRESENT_L) ? CHARGE_PORT_TYPEC0 : - CHARGE_PORT_BARRELJACK; + port = gpio_get_level(GPIO_BJ_ADP_PRESENT) ? CHARGE_PORT_BARRELJACK : + CHARGE_PORT_TYPEC0; CPRINTUSB("Power source is p%d (%s)", port, port == CHARGE_PORT_TYPEC0 ? "USB-C" : "BJ"); diff --git a/board/dibbi/gpio.inc b/board/dibbi/gpio.inc index 3b300a603a..21c5fbf415 100644 --- a/board/dibbi/gpio.inc +++ b/board/dibbi/gpio.inc @@ -35,7 +35,7 @@ GPIO_INT(EC_WP_OD, PIN(A, 6), GPIO_INT_BOTH, switch_interrupt) GPIO_INT(EC_RECOVERY_BTN_ODL, PIN(K, 7), GPIO_INT_BOTH, button_interrupt) /* Recovery button input from H1 */ GPIO_INT(H1_EC_RECOVERY_BTN_ODL,PIN(K, 4), GPIO_INT_BOTH, button_interrupt) -GPIO_INT(BJ_ADP_PRESENT_L, PIN(A, 7), GPIO_INT_BOTH | GPIO_PULL_UP, adp_connect_interrupt) +GPIO_INT(BJ_ADP_PRESENT, PIN(A, 7), GPIO_INT_BOTH, adp_connect_interrupt) GPIO_INT(USB_C0_FAULT_L, PIN(K, 0), GPIO_INT_FALLING, ppc_interrupt) /* Power sequence GPIOs */ |