diff options
| author | Shawn Nematbakhsh <shawnn@chromium.org> | 2017-01-27 13:35:03 -0800 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2017-01-29 07:46:09 +0000 |
| commit | 313133315822910cccdfee5929df6a6ad2758253 (patch) | |
| tree | 42448a164c52bb725a583e1128d8003034e6b4e9 | |
| parent | 0adc161e46204b1e738a090c8dd05849cbbed8b9 (diff) | |
| download | chrome-ec-313133315822910cccdfee5929df6a6ad2758253.tar.gz | |
caroline: Unify vbus_evt ISRs for code size savings
BUG=chrome-os-partner:58657
TEST=Verify __hey_flash_used reduced by 64 bytes and subsequent CL
passes compilation.
BRANCH=glados
Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org>
Change-Id: I984eb1da4606b677141a326a17b23d2d349f57ab
Reviewed-on: https://chromium-review.googlesource.com/434180
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Commit-Queue: Vincent Palatin <vpalatin@chromium.org>
| -rw-r--r-- | board/caroline/board.c | 13 | ||||
| -rw-r--r-- | board/caroline/gpio.inc | 4 |
2 files changed, 6 insertions, 11 deletions
diff --git a/board/caroline/board.c b/board/caroline/board.c index ba211c99ce..d3ae1cf7ea 100644 --- a/board/caroline/board.c +++ b/board/caroline/board.c @@ -59,18 +59,13 @@ static void pd_mcu_interrupt(enum gpio_signal signal) #endif } -void vbus0_evt(enum gpio_signal signal) +void vbus_evt(enum gpio_signal signal) { - /* VBUS present GPIO is inverted */ - usb_charger_vbus_change(0, !gpio_get_level(signal)); - task_wake(TASK_ID_PD_C0); -} + int port = (signal == GPIO_USB_C1_VBUS_WAKE_L); -void vbus1_evt(enum gpio_signal signal) -{ /* VBUS present GPIO is inverted */ - usb_charger_vbus_change(1, !gpio_get_level(signal)); - task_wake(TASK_ID_PD_C1); + usb_charger_vbus_change(port, !gpio_get_level(signal)); + task_wake(port ? TASK_ID_PD_C1 : TASK_ID_PD_C0); } void usb0_evt(enum gpio_signal signal) diff --git a/board/caroline/gpio.inc b/board/caroline/gpio.inc index 066c19cb9c..5cd518b463 100644 --- a/board/caroline/gpio.inc +++ b/board/caroline/gpio.inc @@ -19,8 +19,8 @@ GPIO_INT(VOLUME_UP_L, PIN(31), GPIO_INT_BOTH | GPIO_PULL_UP, button_inter GPIO_INT(VOLUME_DOWN_L, PIN(47), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt) GPIO_INT(PMIC_INT_L, PIN(50), GPIO_INT_FALLING, power_signal_interrupt) GPIO_INT(PD_MCU_INT, PIN(122), GPIO_INT_FALLING | GPIO_PULL_UP, pd_mcu_interrupt) -GPIO_INT(USB_C0_VBUS_WAKE_L,PIN(152), GPIO_INT_BOTH, vbus0_evt) -GPIO_INT(USB_C1_VBUS_WAKE_L,PIN(123), GPIO_INT_BOTH, vbus1_evt) +GPIO_INT(USB_C0_VBUS_WAKE_L,PIN(152), GPIO_INT_BOTH, vbus_evt) +GPIO_INT(USB_C1_VBUS_WAKE_L,PIN(123), GPIO_INT_BOTH, vbus_evt) GPIO_INT(USB_C0_BC12_INT_L, PIN(124), GPIO_INT_FALLING, usb0_evt) GPIO_INT(USB_C1_BC12_INT_L, PIN(145), GPIO_INT_FALLING, usb1_evt) /* Delayed PWR_OK from PMIC */ |