diff options
-rw-r--r-- | board/lazor/board.c | 24 | ||||
-rw-r--r-- | board/lazor/usbc_config.c | 24 |
2 files changed, 24 insertions, 24 deletions
diff --git a/board/lazor/board.c b/board/lazor/board.c index 94821aec5b..8749412486 100644 --- a/board/lazor/board.c +++ b/board/lazor/board.c @@ -454,30 +454,6 @@ void board_hibernate(void) ppc_vbus_sink_enable(i, 1); } -void board_tcpc_init(void) -{ - /* Only reset TCPC if not sysjump */ - if (!system_jumped_late()) { - /* TODO(crosbug.com/p/61098): How long do we need to wait? */ - board_reset_pd_mcu(); - } - - /* Enable PPC interrupts */ - gpio_enable_interrupt(GPIO_USB_C0_SWCTL_INT_ODL); - - /* Enable TCPC interrupts */ - gpio_enable_interrupt(GPIO_USB_C0_PD_INT_ODL); - gpio_enable_interrupt(GPIO_USB_C1_PD_INT_ODL); - - /* - * Initialize HPD to low; after sysjump SOC needs to see - * HPD pulse to enable video path - */ - for (int port = 0; port < CONFIG_USB_PD_PORT_MAX_COUNT; ++port) - usb_mux_hpd_update(port, 0, 0); -} -DECLARE_HOOK(HOOK_INIT, board_tcpc_init, HOOK_PRIO_INIT_I2C+1); - /* Called on AP S0 -> S3 transition */ static void board_chipset_suspend(void) { diff --git a/board/lazor/usbc_config.c b/board/lazor/usbc_config.c index 20a8967c3a..9d5b13b4a5 100644 --- a/board/lazor/usbc_config.c +++ b/board/lazor/usbc_config.c @@ -168,6 +168,30 @@ const struct pi3usb9201_config_t pi3usb9201_bc12_chips[] = { }, }; +void board_tcpc_init(void) +{ + /* Only reset TCPC if not sysjump */ + if (!system_jumped_late()) { + /* TODO(crosbug.com/p/61098): How long do we need to wait? */ + board_reset_pd_mcu(); + } + + /* Enable PPC interrupts */ + gpio_enable_interrupt(GPIO_USB_C0_SWCTL_INT_ODL); + + /* Enable TCPC interrupts */ + gpio_enable_interrupt(GPIO_USB_C0_PD_INT_ODL); + gpio_enable_interrupt(GPIO_USB_C1_PD_INT_ODL); + + /* + * Initialize HPD to low; after sysjump SOC needs to see + * HPD pulse to enable video path + */ + for (int port = 0; port < CONFIG_USB_PD_PORT_MAX_COUNT; ++port) + usb_mux_hpd_update(port, 0, 0); +} +DECLARE_HOOK(HOOK_INIT, board_tcpc_init, HOOK_PRIO_INIT_I2C + 1); + void board_reset_pd_mcu(void) { cprints(CC_USB, "Resetting TCPCs..."); |