diff options
| author | Edward Hill <ecgh@chromium.org> | 2020-03-17 21:05:24 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-03-20 18:14:20 +0000 |
| commit | eedeace7ae301aca482d6a2f5a2d722e1e0cec31 (patch) | |
| tree | 6f2bd874e8784668b44df3d29feaed668811aad9 | |
| parent | d9f78047be7d7cc1d2e9279a6f2c3bac16c54af9 (diff) | |
| download | chrome-ec-eedeace7ae301aca482d6a2f5a2d722e1e0cec31.tar.gz | |
zork: split baseboard_tcpc_init to trembyle and dalboz
BUG=b:150349225
BRANCH=none
TEST=none
Signed-off-by: Edward Hill <ecgh@chromium.org>
Change-Id: I5cae9cd365d198873c4d022dd1b166b318c1a4c7
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2108336
Reviewed-by: Denis Brockus <dbrockus@chromium.org>
Reviewed-by: Paul Ma <magf@bitland.corp-partner.google.com>
Tested-by: Paul Ma <magf@bitland.corp-partner.google.com>
| -rw-r--r-- | baseboard/zork/baseboard.c | 22 | ||||
| -rw-r--r-- | baseboard/zork/variant_dalboz.c | 16 | ||||
| -rw-r--r-- | baseboard/zork/variant_trembyle.c | 24 |
3 files changed, 40 insertions, 22 deletions
diff --git a/baseboard/zork/baseboard.c b/baseboard/zork/baseboard.c index 2a10392077..19e167a45e 100644 --- a/baseboard/zork/baseboard.c +++ b/baseboard/zork/baseboard.c @@ -295,28 +295,6 @@ const struct pi3usb9201_config_t pi3usb9201_bc12_chips[] = { }; BUILD_ASSERT(ARRAY_SIZE(pi3usb9201_bc12_chips) == USBC_PORT_COUNT); -void baseboard_tcpc_init(void) -{ - /* Enable PPC interrupts. */ - gpio_enable_interrupt(GPIO_USB_C0_PPC_FAULT_ODL); - gpio_enable_interrupt(GPIO_USB_C1_PPC_INT_ODL); - - /* Enable TCPC interrupts. */ - gpio_enable_interrupt(GPIO_USB_C0_TCPC_INT_ODL); - gpio_enable_interrupt(GPIO_USB_C1_TCPC_INT_ODL); - - /* Enable BC 1.2 interrupts */ - gpio_enable_interrupt(GPIO_USB_C0_BC12_INT_ODL); - gpio_enable_interrupt(GPIO_USB_C1_BC12_INT_ODL); - - /* Enable HPD interrupts */ - ioex_enable_interrupt(IOEX_HDMI_CONN_HPD_3V3_DB); -#ifdef VARIANT_ZORK_TREMBYLE - ioex_enable_interrupt(IOEX_MST_HPD_OUT); -#endif -} -DECLARE_HOOK(HOOK_INIT, baseboard_tcpc_init, HOOK_PRIO_INIT_I2C + 1); - /* * In the AOZ1380 PPC, there are no programmable features. We use * the attached NCT3807 to control a GPIO to indicate 1A5 or 3A0 diff --git a/baseboard/zork/variant_dalboz.c b/baseboard/zork/variant_dalboz.c index 92617e62bf..753b77b0ca 100644 --- a/baseboard/zork/variant_dalboz.c +++ b/baseboard/zork/variant_dalboz.c @@ -14,6 +14,22 @@ #include "ioexpander_nct38xx.h" #include "usb_mux.h" +void baseboard_tcpc_init(void) +{ + /* Enable PPC interrupts. */ + gpio_enable_interrupt(GPIO_USB_C0_PPC_FAULT_ODL); + gpio_enable_interrupt(GPIO_USB_C1_PPC_INT_ODL); + + /* Enable TCPC interrupts. */ + gpio_enable_interrupt(GPIO_USB_C0_TCPC_INT_ODL); + gpio_enable_interrupt(GPIO_USB_C1_TCPC_INT_ODL); + + /* Enable BC 1.2 interrupts */ + gpio_enable_interrupt(GPIO_USB_C0_BC12_INT_ODL); + gpio_enable_interrupt(GPIO_USB_C1_BC12_INT_ODL); +} +DECLARE_HOOK(HOOK_INIT, baseboard_tcpc_init, HOOK_PRIO_INIT_I2C + 1); + struct ioexpander_config_t ioex_config[] = { [IOEX_C0_NCT3807] = { .i2c_host_port = I2C_PORT_TCPC0, diff --git a/baseboard/zork/variant_trembyle.c b/baseboard/zork/variant_trembyle.c index c602d792e9..f33f66f32e 100644 --- a/baseboard/zork/variant_trembyle.c +++ b/baseboard/zork/variant_trembyle.c @@ -24,6 +24,30 @@ #define CPRINTFUSB(format, args...) cprintf(CC_USBCHARGE, format, ## args) /***************************************************************************** + * TCPC + */ + +void baseboard_tcpc_init(void) +{ + /* Enable PPC interrupts. */ + gpio_enable_interrupt(GPIO_USB_C0_PPC_FAULT_ODL); + gpio_enable_interrupt(GPIO_USB_C1_PPC_INT_ODL); + + /* Enable TCPC interrupts. */ + gpio_enable_interrupt(GPIO_USB_C0_TCPC_INT_ODL); + gpio_enable_interrupt(GPIO_USB_C1_TCPC_INT_ODL); + + /* Enable BC 1.2 interrupts */ + gpio_enable_interrupt(GPIO_USB_C0_BC12_INT_ODL); + gpio_enable_interrupt(GPIO_USB_C1_BC12_INT_ODL); + + /* Enable HPD interrupts */ + ioex_enable_interrupt(IOEX_HDMI_CONN_HPD_3V3_DB); + ioex_enable_interrupt(IOEX_MST_HPD_OUT); +} +DECLARE_HOOK(HOOK_INIT, baseboard_tcpc_init, HOOK_PRIO_INIT_I2C + 1); + +/***************************************************************************** * IO expander */ |