diff options
author | Jett Rink <jettrink@chromium.org> | 2018-06-06 09:31:01 -0600 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2018-06-07 08:35:55 -0700 |
commit | 5390c49fdedd691f807fbac8dd387b48099a0852 (patch) | |
tree | 8592e9a35ae02856cb5f18a97e987f528427136f /board/yorp | |
parent | 31815b74ffdcd3979ba075e04f39e7fb704957f8 (diff) | |
download | chrome-ec-5390c49fdedd691f807fbac8dd387b48099a0852.tar.gz |
octopus: rename USB-C signal names
Simple rename of gpio based on newest schematics for yorp and phaser
BRANCH=none
BUG=b:109747036,b:109747361
TEST=build
Change-Id: I08d9010f16e623ca41bb66363d568c4b5bd687e8
Signed-off-by: Jett Rink <jettrink@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1089040
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Furquan Shaikh <furquan@chromium.org>
Diffstat (limited to 'board/yorp')
-rw-r--r-- | board/yorp/board.c | 6 | ||||
-rw-r--r-- | board/yorp/gpio.inc | 8 |
2 files changed, 7 insertions, 7 deletions
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 |