diff options
| author | Ting Shen <phoenixshen@google.com> | 2021-09-22 18:03:47 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-09-23 06:42:27 +0000 |
| commit | b10127e7a40c99058ec2713184e8043b7fb3c7bd (patch) | |
| tree | cc1037a9cf78e2b9e5a4dcd4c36c51aceada2062 | |
| parent | 3151e266808c9cbff6a5274ad8ab993e5b7d09f0 (diff) | |
| download | chrome-ec-b10127e7a40c99058ec2713184e8043b7fb3c7bd.tar.gz | |
cherry: enable CONFIG_USB_PORT_POWER_DUMB_CUSTOM_HOOK
CL:3023017 does not work as expected because usb_port_power_dump module
still controls the power power.
This CL disables the hooks in usb_port_power_dump and enables the
interrupt function usb_a0_interrupt instead.
BUG=b:193499785
TEST=verify USB-A port works after this change
BRANCH=main
Signed-off-by: Ting Shen <phoenixshen@google.com>
Change-Id: I56196f2a062d6b3358a9a4330e7f33ab546f5d1b
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3174606
Reviewed-by: Rong Chang <rongchang@chromium.org>
Commit-Queue: Ting Shen <phoenixshen@chromium.org>
Tested-by: Ting Shen <phoenixshen@chromium.org>
| -rw-r--r-- | baseboard/cherry/baseboard.c | 3 | ||||
| -rw-r--r-- | baseboard/cherry/baseboard.h | 1 | ||||
| -rw-r--r-- | board/cherry/gpio.inc | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/baseboard/cherry/baseboard.c b/baseboard/cherry/baseboard.c index 692c14cf73..8123ceaa9c 100644 --- a/baseboard/cherry/baseboard.c +++ b/baseboard/cherry/baseboard.c @@ -559,6 +559,9 @@ int board_regulator_get_voltage(uint32_t index, uint32_t *voltage_mv) static void baseboard_init(void) { gpio_enable_interrupt(GPIO_USB_C0_BC12_INT_ODL); +#ifndef BOARD_CHERRY + gpio_enable_interrupt(GPIO_AP_XHCI_INIT_DONE); +#endif } DECLARE_HOOK(HOOK_INIT, baseboard_init, HOOK_PRIO_DEFAULT - 1); diff --git a/baseboard/cherry/baseboard.h b/baseboard/cherry/baseboard.h index 349a10997d..39bc9d543d 100644 --- a/baseboard/cherry/baseboard.h +++ b/baseboard/cherry/baseboard.h @@ -161,6 +161,7 @@ /* USB-A */ #define CONFIG_USB_PORT_POWER_DUMB +#define CONFIG_USB_PORT_POWER_DUMB_CUSTOM_HOOK #define USB_PORT_COUNT USBA_PORT_COUNT /* UART */ diff --git a/board/cherry/gpio.inc b/board/cherry/gpio.inc index 895ec70f8c..f3bf7d8364 100644 --- a/board/cherry/gpio.inc +++ b/board/cherry/gpio.inc @@ -57,7 +57,7 @@ GPIO_INT(WP, PIN(I, 4), GPIO_INT_BOTH | GPIO_SEL_1P8V, switch_interrupt) /* EC_FLASH_WP_OD */ GPIO_INT(SPI0_CS, PIN(M, 5), GPIO_INT_FALLING, spi_event) /* SPI slave Chip Select -- AP_SPI_EC_CS_L */ -#ifdef BOARD_TOMATO +#ifndef BOARD_CHERRY GPIO_INT(AP_XHCI_INIT_DONE, PIN(J, 5), GPIO_INT_BOTH | GPIO_PULL_DOWN | GPIO_SEL_1P8V, usb_a0_interrupt) #endif |