diff options
| -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 |