diff options
| -rw-r--r-- | baseboard/octopus/variant_usbc_standalone_tcpcs.c | 12 | ||||
| -rw-r--r-- | board/phaser/board.c | 6 | ||||
| -rw-r--r-- | board/phaser/gpio.inc | 8 | ||||
| -rw-r--r-- | board/yorp/board.c | 6 | ||||
| -rw-r--r-- | board/yorp/gpio.inc | 8 |
5 files changed, 20 insertions, 20 deletions
diff --git a/baseboard/octopus/variant_usbc_standalone_tcpcs.c b/baseboard/octopus/variant_usbc_standalone_tcpcs.c index 93ec1923bd..3d1eb4da63 100644 --- a/baseboard/octopus/variant_usbc_standalone_tcpcs.c +++ b/baseboard/octopus/variant_usbc_standalone_tcpcs.c @@ -82,12 +82,12 @@ unsigned int ppc_cnt = ARRAY_SIZE(ppc_chips); void variant_tcpc_init(void) { /* Enable PPC interrupts. */ - gpio_enable_interrupt(GPIO_USB_PD_C0_INT_L); - gpio_enable_interrupt(GPIO_USB_PD_C1_INT_L); + gpio_enable_interrupt(GPIO_USB_PD_C0_INT_ODL); + gpio_enable_interrupt(GPIO_USB_PD_C1_INT_ODL); /* Enable TCPC interrupts. */ - gpio_enable_interrupt(GPIO_USB_C0_PD_INT_ODL); - gpio_enable_interrupt(GPIO_USB_C1_PD_INT_ODL); + gpio_enable_interrupt(GPIO_USB_C0_MUX_INT_ODL); + gpio_enable_interrupt(GPIO_USB_C1_MUX_INT_ODL); } /* Called after the baseboard_tcpc_init (via +2) */ DECLARE_HOOK(HOOK_INIT, variant_tcpc_init, HOOK_PRIO_INIT_I2C + 2); @@ -96,10 +96,10 @@ uint16_t tcpc_get_alert_status(void) { uint16_t status = 0; - if (!gpio_get_level(GPIO_USB_C0_PD_INT_ODL)) + if (!gpio_get_level(GPIO_USB_C0_MUX_INT_ODL)) status |= PD_STATUS_TCPC_ALERT_0; - if (!gpio_get_level(GPIO_USB_C1_PD_INT_ODL)) { + if (!gpio_get_level(GPIO_USB_C1_MUX_INT_ODL)) { if (gpio_get_level(GPIO_USB_C1_PD_RST_ODL)) status |= PD_STATUS_TCPC_ALERT_1; } diff --git a/board/phaser/board.c b/board/phaser/board.c index 3d835ad4dd..6fb6464b65 100644 --- a/board/phaser/board.c +++ b/board/phaser/board.c @@ -20,7 +20,7 @@ static void tcpc_alert_event(enum gpio_signal signal) { - if ((signal == GPIO_USB_C1_PD_INT_ODL) && + if ((signal == GPIO_USB_C1_MUX_INT_ODL) && !gpio_get_level(GPIO_USB_C1_PD_RST_ODL)) return; @@ -33,11 +33,11 @@ static void tcpc_alert_event(enum gpio_signal signal) static void ppc_interrupt(enum gpio_signal signal) { switch (signal) { - case GPIO_USB_PD_C0_INT_L: + case GPIO_USB_PD_C0_INT_ODL: nx20p3483_interrupt(0); break; - case GPIO_USB_PD_C1_INT_L: + case GPIO_USB_PD_C1_INT_ODL: nx20p3483_interrupt(1); break; diff --git a/board/phaser/gpio.inc b/board/phaser/gpio.inc index 3d4d8a78ec..12602854bb 100644 --- a/board/phaser/gpio.inc +++ b/board/phaser/gpio.inc @@ -16,10 +16,10 @@ GPIO_INT(AC_PRESENT, PIN(0, 0), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, extpower_interrupt) /* ACOK_OD */ /* USB-C interrupts */ -GPIO_INT(USB_C0_PD_INT_ODL, PIN(6, 1), GPIO_INT_FALLING, tcpc_alert_event) -GPIO_INT(USB_C1_PD_INT_ODL, PIN(F, 5), GPIO_INT_FALLING, tcpc_alert_event) -GPIO_INT(USB_PD_C0_INT_L, PIN(E, 0), GPIO_INT_FALLING, ppc_interrupt) -GPIO_INT(USB_PD_C1_INT_L, PIN(F, 1), GPIO_INT_FALLING, ppc_interrupt) +GPIO_INT(USB_C0_MUX_INT_ODL, PIN(6, 1), GPIO_INT_FALLING, tcpc_alert_event) +GPIO_INT(USB_C1_MUX_INT_ODL, PIN(F, 5), GPIO_INT_FALLING, tcpc_alert_event) +GPIO_INT(USB_PD_C0_INT_ODL, PIN(E, 0), GPIO_INT_FALLING, ppc_interrupt) +GPIO_INT(USB_PD_C1_INT_ODL, PIN(F, 1), GPIO_INT_FALLING, ppc_interrupt) /* Power State interrupts */ #ifdef CONFIG_POWER_S0IX diff --git a/board/yorp/board.c b/board/yorp/board.c index 7e4111116e..8e2ba6fcf3 100644 --- a/board/yorp/board.c +++ b/board/yorp/board.c @@ -45,7 +45,7 @@ static void tcpc_alert_event(enum gpio_signal signal) { - if ((signal == GPIO_USB_C1_PD_INT_ODL) && + if ((signal == GPIO_USB_C1_MUX_INT_ODL) && !gpio_get_level(GPIO_USB_C1_PD_RST_ODL)) return; @@ -58,11 +58,11 @@ static void tcpc_alert_event(enum gpio_signal signal) static void ppc_interrupt(enum gpio_signal signal) { switch (signal) { - case GPIO_USB_PD_C0_INT_L: + case GPIO_USB_PD_C0_INT_ODL: nx20p3483_interrupt(0); break; - case GPIO_USB_PD_C1_INT_L: + case GPIO_USB_PD_C1_INT_ODL: nx20p3483_interrupt(1); break; diff --git a/board/yorp/gpio.inc b/board/yorp/gpio.inc index 9f3e3dd35f..48b8aaea31 100644 --- a/board/yorp/gpio.inc +++ b/board/yorp/gpio.inc @@ -21,10 +21,10 @@ GPIO_INT(AC_PRESENT, PIN(0, 0), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, extpower_i GPIO_INT(TABLET_MODE_L, PIN(8, 6), GPIO_INT_BOTH, tablet_mode_isr) /* USB-C interrupts */ -GPIO_INT(USB_C0_PD_INT_ODL, PIN(6, 1), GPIO_INT_FALLING, tcpc_alert_event) -GPIO_INT(USB_C1_PD_INT_ODL, PIN(F, 5), GPIO_INT_FALLING, tcpc_alert_event) -GPIO_INT(USB_PD_C0_INT_L, PIN(E, 0), GPIO_INT_FALLING, ppc_interrupt) -GPIO_INT(USB_PD_C1_INT_L, PIN(F, 1), GPIO_INT_FALLING, ppc_interrupt) +GPIO_INT(USB_C0_MUX_INT_ODL, PIN(6, 1), GPIO_INT_FALLING, tcpc_alert_event) +GPIO_INT(USB_C1_MUX_INT_ODL, PIN(F, 5), GPIO_INT_FALLING, tcpc_alert_event) +GPIO_INT(USB_PD_C0_INT_ODL, PIN(E, 0), GPIO_INT_FALLING, ppc_interrupt) +GPIO_INT(USB_PD_C1_INT_ODL, PIN(F, 1), GPIO_INT_FALLING, ppc_interrupt) /* Power State interrupts */ #ifdef CONFIG_POWER_S0IX |