diff options
Diffstat (limited to 'baseboard')
| -rw-r--r-- | baseboard/zork/baseboard.c | 17 | ||||
| -rw-r--r-- | baseboard/zork/baseboard.h | 19 | ||||
| -rw-r--r-- | baseboard/zork/variant_dalboz.c | 46 | ||||
| -rw-r--r-- | baseboard/zork/variant_trembyle.c | 21 |
4 files changed, 25 insertions, 78 deletions
diff --git a/baseboard/zork/baseboard.c b/baseboard/zork/baseboard.c index ac7ab61023..254a1d54f9 100644 --- a/baseboard/zork/baseboard.c +++ b/baseboard/zork/baseboard.c @@ -569,23 +569,6 @@ void board_hibernate(void) } } -static void hdmi_hpd_handler(void) -{ - int hpd = 0; - - /* Pass HPD through from DB OPT1 HDMI connector to AP's DP1. */ - ioex_get_level(IOEX_HDMI_CONN_HPD_3V3_DB, &hpd); - gpio_set_level(GPIO_DP1_HPD, hpd); - ccprints("HDMI HPD %d", hpd); -} -DECLARE_DEFERRED(hdmi_hpd_handler); - -void hdmi_hpd_interrupt(enum ioex_signal signal) -{ - /* Debounce for 2 msec. */ - hook_call_deferred(&hdmi_hpd_handler_data, (2 * MSEC)); -} - const struct pi3hdx1204_tuning pi3hdx1204_tuning = { .eq_ch0_ch1_offset = PI3HDX1204_EQ_DB710, .eq_ch2_ch3_offset = PI3HDX1204_EQ_DB710, diff --git a/baseboard/zork/baseboard.h b/baseboard/zork/baseboard.h index a8e266d2d4..ed4d4b4e18 100644 --- a/baseboard/zork/baseboard.h +++ b/baseboard/zork/baseboard.h @@ -176,7 +176,6 @@ #elif defined(VARIANT_ZORK_DALBOZ) #define CONFIG_USB_MUX_PS8740 #define CONFIG_USB_MUX_PS8743 - #define CONFIG_IO_EXPANDER_PCAL6408 #define CONFIG_IO_EXPANDER_PORT_COUNT IOEX_PORT_COUNT #define CONFIG_USB_PORT_ENABLE_DYNAMIC #endif @@ -323,19 +322,6 @@ enum sensor_id { SENSOR_COUNT, }; -#if defined(VARIANT_ZORK_DALBOZ) - enum ioex_port { - IOEX_C0_NCT3807 = 0, - IOEX_C1_NCT3807, - IOEX_HDMI_PCAL6408, - IOEX_PORT_COUNT - }; - - #define PORT_TO_HPD(port) ((port == 0) \ - ? GPIO_USB3_C0_DP2_HPD \ - : GPIO_DP1_HPD) -#endif - /* * Matrix to rotate accelerators into the standard reference frame. The default * is the identity which is correct for the reference design. Variations of @@ -362,9 +348,12 @@ void board_reset_pd_mcu(void); void tcpc_alert_event(enum gpio_signal signal); void bc12_interrupt(enum gpio_signal signal); void ppc_interrupt(enum gpio_signal signal); -void hdmi_hpd_interrupt(enum ioex_signal signal); void mst_hpd_interrupt(enum ioex_signal signal); +#ifdef VARIANT_ZORK_TREMBYLE +void hdmi_hpd_interrupt(enum ioex_signal signal); +#endif + #ifdef CONFIG_USB_TYPEC_PD_FAST_ROLE_SWAP int board_tcpc_fast_role_swap_enable(int port, int enable); #endif diff --git a/baseboard/zork/variant_dalboz.c b/baseboard/zork/variant_dalboz.c index 517532a7bb..c7a9ae7e97 100644 --- a/baseboard/zork/variant_dalboz.c +++ b/baseboard/zork/variant_dalboz.c @@ -91,52 +91,6 @@ const struct charger_config_t chg_chips[] = { const unsigned int chg_cnt = ARRAY_SIZE(chg_chips); /***************************************************************************** - * IO expander - */ - -struct ioexpander_config_t ioex_config[] = { - [IOEX_C0_NCT3807] = { - .i2c_host_port = I2C_PORT_TCPC0, - .i2c_slave_addr = NCT38XX_I2C_ADDR1_1_FLAGS, - .drv = &nct38xx_ioexpander_drv, - }, - [IOEX_C1_NCT3807] = { - .i2c_host_port = I2C_PORT_TCPC1, - .i2c_slave_addr = NCT38XX_I2C_ADDR1_1_FLAGS, - .drv = &nct38xx_ioexpander_drv, - .flags = IOEX_FLAGS_DISABLED, - }, - [IOEX_HDMI_PCAL6408] = { - .i2c_host_port = I2C_PORT_TCPC1, - .i2c_slave_addr = PCAL6408_I2C_ADDR0, - .drv = &pcal6408_ioexpander_drv, - .flags = IOEX_FLAGS_DISABLED, - }, -}; -BUILD_ASSERT(ARRAY_SIZE(ioex_config) == CONFIG_IO_EXPANDER_PORT_COUNT); - -/***************************************************************************** - * USB-A - */ - -int usb_port_enable[USBA_PORT_COUNT] = { - IOEX_EN_USB_A0_5V, - IOEX_EN_USB_A1_5V_DB_OPT1, -}; - -static void usba_retimer_on(void) -{ - ioex_set_level(IOEX_USB_A1_RETIMER_EN, 1); -} -DECLARE_HOOK(HOOK_CHIPSET_RESUME, usba_retimer_on, HOOK_PRIO_DEFAULT); - -static void usba_retimer_off(void) -{ - ioex_set_level(IOEX_USB_A1_RETIMER_EN, 0); -} -DECLARE_HOOK(HOOK_CHIPSET_SUSPEND, usba_retimer_off, HOOK_PRIO_DEFAULT); - -/***************************************************************************** * USB-C */ diff --git a/baseboard/zork/variant_trembyle.c b/baseboard/zork/variant_trembyle.c index ebb2ff6e76..d39bc7521f 100644 --- a/baseboard/zork/variant_trembyle.c +++ b/baseboard/zork/variant_trembyle.c @@ -302,3 +302,24 @@ struct usb_mux usbc1_amd_fp5_usb_mux = { .i2c_addr_flags = AMD_FP5_MUX_I2C_ADDR_FLAGS, .driver = &amd_fp5_usb_mux_driver, }; + +/***************************************************************************** + * HDMI HPD + */ + +static void hdmi_hpd_handler(void) +{ + int hpd = 0; + + /* Pass HPD through from DB OPT1 HDMI connector to AP's DP1. */ + ioex_get_level(IOEX_HDMI_CONN_HPD_3V3_DB, &hpd); + gpio_set_level(GPIO_DP1_HPD, hpd); + ccprints("HDMI HPD %d", hpd); +} +DECLARE_DEFERRED(hdmi_hpd_handler); + +void hdmi_hpd_interrupt(enum ioex_signal signal) +{ + /* Debounce for 2 msec. */ + hook_call_deferred(&hdmi_hpd_handler_data, (2 * MSEC)); +} |