diff options
author | Yu-An Chen <yu-an.chen@quanta.corp-partner.google.com> | 2022-02-11 09:30:39 +0800 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2022-02-14 23:00:52 +0000 |
commit | d62c68b98954cae2c00effee5c5c38bd6e849c88 (patch) | |
tree | 24f9a0d94449be8a96bab0e08b1838445bef6a06 | |
parent | 3a1d09a725758f2074ebc091e5b90c207b38892f (diff) | |
download | chrome-ec-d62c68b98954cae2c00effee5c5c38bd6e849c88.tar.gz |
volmar: Remove retimer config
Remove retimer config
BUG=b:211891086
BRANCH=none
TEST=Check usb3/usb2/dp working
Signed-off-by: Yu-An Chen <yu-an.chen@quanta.corp-partner.google.com>
Change-Id: Iec9982a43923e7d36cfd5db7804db5aab2deaedc
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3454622
Reviewed-by: Boris Mittelberg <bmbm@google.com>
Commit-Queue: caveh jalali <caveh@chromium.org>
-rw-r--r-- | board/volmar/board.h | 20 | ||||
-rw-r--r-- | board/volmar/gpio.inc | 7 | ||||
-rw-r--r-- | board/volmar/i2c.c | 8 | ||||
-rw-r--r-- | board/volmar/usbc_config.c | 58 |
4 files changed, 8 insertions, 85 deletions
diff --git a/board/volmar/board.h b/board/volmar/board.h index d04f4b3b68..6c702335af 100644 --- a/board/volmar/board.h +++ b/board/volmar/board.h @@ -49,7 +49,9 @@ #define CONFIG_USB_PD_TCPM_RT1715 /* C0 */ #define CONFIG_USB_PD_TCPM_PS8815 /* C1 */ #define CONFIG_USB_PD_TCPM_PS8815_FORCE_DID -#define CONFIG_USBC_RETIMER_INTEL_BB + +/* Retimer */ +#undef CONFIG_USBC_RETIMER_INTEL_BB /* I2C speed console command */ #define CONFIG_CMD_I2C_SPEED @@ -122,7 +124,6 @@ #define I2C_PORT_USB_C0_C2_BC12 NPCX_I2C_PORT2_0 #define I2C_PORT_USB_C1_BC12 NPCX_I2C_PORT6_1 -#define I2C_PORT_USB_C0_C2_MUX NPCX_I2C_PORT3_0 #define I2C_PORT_USB_C1_MUX NPCX_I2C_PORT6_1 #define I2C_PORT_BATTERY NPCX_I2C_PORT5_0 @@ -134,21 +135,6 @@ #define I2C_ADDR_MP2964_FLAGS 0x20 -/* - * see b/174768555#comment22 - */ -#define USBC_PORT_C0_BB_RETIMER_I2C_ADDR 0x56 -#define USBC_PORT_C2_BB_RETIMER_I2C_ADDR 0x57 - -/* Enabling Thunderbolt-compatible mode */ -#define CONFIG_USB_PD_TBT_COMPAT_MODE - -/* Enabling USB4 mode */ -#define CONFIG_USB_PD_USB4 - -/* Retimer */ -#define CONFIG_USBC_RETIMER_FW_UPDATE - /* Thermal features */ #define CONFIG_THERMISTOR #define CONFIG_TEMP_SENSOR diff --git a/board/volmar/gpio.inc b/board/volmar/gpio.inc index 898842f920..27315651f8 100644 --- a/board/volmar/gpio.inc +++ b/board/volmar/gpio.inc @@ -25,7 +25,6 @@ GPIO_INT(TABLET_MODE_L, PIN(9, 5), GPIO_INT_BOTH, gmr_tablet_sw GPIO_INT(USB_C0_BC12_INT_ODL, PIN(C, 6), GPIO_INT_FALLING, bc12_interrupt) GPIO_INT(USB_C0_C2_TCPC_INT_ODL, PIN(E, 0), GPIO_INT_FALLING, tcpc_alert_event) GPIO_INT(USB_C0_PPC_INT_ODL, PIN(6, 2), GPIO_INT_FALLING, ppc_interrupt) -GPIO_INT(USB_C0_RT_INT_ODL, PIN(B, 1), GPIO_INT_FALLING, retimer_interrupt) GPIO_INT(USB_C1_BC12_INT_ODL, PIN(5, 0), GPIO_INT_FALLING, bc12_interrupt) GPIO_INT(USB_C1_PPC_INT_ODL, PIN(F, 5), GPIO_INT_FALLING, ppc_interrupt) GPIO_INT(USB_C1_TCPC_INT_ODL, PIN(A, 2), GPIO_INT_FALLING, tcpc_alert_event) @@ -46,8 +45,6 @@ GPIO(EC_I2C_SENSOR_SCL, PIN(B, 5), GPIO_INPUT | GPIO_SEL_1P8V) GPIO(EC_I2C_SENSOR_SDA, PIN(B, 4), GPIO_INPUT | GPIO_SEL_1P8V) GPIO(EC_I2C_USB_C0_C2_PPC_BC_SCL, PIN(9, 2), GPIO_INPUT) GPIO(EC_I2C_USB_C0_C2_PPC_BC_SDA, PIN(9, 1), GPIO_INPUT) -GPIO(EC_I2C_USB_C0_C2_RT_SCL, PIN(D, 1), GPIO_INPUT) -GPIO(EC_I2C_USB_C0_C2_RT_SDA, PIN(D, 0), GPIO_INPUT) GPIO(EC_I2C_USB_C0_C2_TCPC_SCL, PIN(9, 0), GPIO_INPUT) GPIO(EC_I2C_USB_C0_C2_TCPC_SDA, PIN(8, 7), GPIO_INPUT) GPIO(EC_I2C_USB_C1_MIX_SCL, PIN(E, 4), GPIO_INPUT) @@ -85,7 +82,6 @@ ALTERNATE(PIN_MASK(8, 0x80), 0, MODULE_I2C, 0) /* GPIO87/I2C1_SDA0 ALTERNATE(PIN_MASK(9, 0x07), 0, MODULE_I2C, 0) /* GPIO92/I2C2_SCL0, GPIO91/I2C2_SDA0, GPIO90/I2C1_SCL0 */ ALTERNATE(PIN_MASK(B, 0x0c), 0, MODULE_I2C, 0) /* GPIOB3/I2C7_SCL0/DCD_L, GPIOB2/I2C7_SDA0/DSR_L */ ALTERNATE(PIN_MASK(B, 0x30), 0, MODULE_I2C, GPIO_SEL_1P8V) /* GPIOB5/I2C0_SCL0, GPIOB4/I2C0_SDA0 */ -ALTERNATE(PIN_MASK(D, 0x03), 0, MODULE_I2C, 0) /* GPIOD1/I2C3_SCL0, GPIOD0/I2C3_SDA0 */ ALTERNATE(PIN_MASK(E, 0x18), 0, MODULE_I2C, 0) /* GPIOE4/I2C6_SCL1/I3C_SCL, GPIOE3/I2C6_SDA1/I3C_SDA */ ALTERNATE(PIN_MASK(F, 0x0c), 0, MODULE_I2C, 0) /* GPIOF3/I2C4_SCL1, GPIOF2/I2C4_SDA1 */ @@ -124,6 +120,9 @@ UNUSED(PIN(7, 0)) /* GPIO70 */ UNUSED(PIN(4, 1)) /* GPIO41 */ UNUSED(PIN(8, 1)) /* GPIO81 */ UNUSED(PIN(5, 6)) /* GPIO56 */ +UNUSED(PIN(B, 1)) /* GPIOB1 */ +UNUSED(PIN(D, 0)) /* GPIOD0/I2C3_SDA0 */ +UNUSED(PIN(D, 1)) /* GPIOD1/I2C3_SCL0 */ /* Pre-configured PSL balls: J8 K6 */ diff --git a/board/volmar/i2c.c b/board/volmar/i2c.c index b63cfa645f..74d5d2878e 100644 --- a/board/volmar/i2c.c +++ b/board/volmar/i2c.c @@ -37,14 +37,6 @@ const struct i2c_port_t i2c_ports[] = { .sda = GPIO_EC_I2C_USB_C0_C2_PPC_BC_SDA, }, { - /* I2C3 */ - .name = "retimer0,2", - .port = I2C_PORT_USB_C0_C2_MUX, - .kbps = 1000, - .scl = GPIO_EC_I2C_USB_C0_C2_RT_SCL, - .sda = GPIO_EC_I2C_USB_C0_C2_RT_SDA, - }, - { /* I2C4 C1 TCPC */ .name = "tcpc1", .port = I2C_PORT_USB_C1_TCPC, diff --git a/board/volmar/usbc_config.c b/board/volmar/usbc_config.c index 09cd7dd332..84eb749b13 100644 --- a/board/volmar/usbc_config.c +++ b/board/volmar/usbc_config.c @@ -14,7 +14,6 @@ #include "console.h" #include "driver/bc12/pi3usb9201_public.h" #include "driver/ppc/syv682x_public.h" -#include "driver/retimer/bb_retimer_public.h" #include "driver/tcpm/ps8xxx_public.h" #include "driver/tcpm/rt1715.h" #include "driver/tcpm/tcpci.h" @@ -93,13 +92,6 @@ BUILD_ASSERT(ARRAY_SIZE(ppc_chips) == USBC_PORT_COUNT); unsigned int ppc_cnt = ARRAY_SIZE(ppc_chips); -/* USBC mux configuration - Alder Lake includes internal mux */ -static const struct usb_mux usbc0_tcss_usb_mux = { - .usb_port = USBC_PORT_C0, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, -}; - /* * USB3 DB mux configuration - the top level mux still needs to be set * to the virtual_usb_mux_driver so the AP gets notified of mux changes @@ -114,11 +106,8 @@ static const struct usb_mux usbc1_usb3_db_retimer = { const struct usb_mux usb_muxes[] = { [USBC_PORT_C0] = { .usb_port = USBC_PORT_C0, - .driver = &bb_usb_retimer, - .hpd_update = bb_retimer_hpd_update, - .i2c_port = I2C_PORT_USB_C0_C2_MUX, - .i2c_addr_flags = USBC_PORT_C0_BB_RETIMER_I2C_ADDR, - .next_mux = &usbc0_tcss_usb_mux, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, }, [USBC_PORT_C1] = { /* PS8815 DB */ @@ -188,42 +177,6 @@ void config_usb_db_type(void) CPRINTS("Configured USB DB type number is %d", db_type); } -__override int bb_retimer_power_enable(const struct usb_mux *me, bool enable) -{ - enum gpio_signal rst_signal; - - if (me->usb_port == USBC_PORT_C0) { - rst_signal = GPIO_USB_C0_RT_RST_ODL; - } else if (me->usb_port == USBC_PORT_C1) { - rst_signal = GPIO_USB_C1_RT_RST_R_ODL; - } else { - return EC_ERROR_INVAL; - } - - /* - * We do not have a load switch for the burnside bridge chips, - * so we only need to sequence reset. - */ - - if (enable) { - /* - * Tpw, minimum time from VCC to RESET_N de-assertion is 100us. - * For boards that don't provide a load switch control, the - * retimer_init() function ensures power is up before calling - * this function. - */ - gpio_set_level(rst_signal, 1); - /* - * Allow 1ms time for the retimer to power up lc_domain - * which powers I2C controller within retimer - */ - msleep(1); - } else { - gpio_set_level(rst_signal, 0); - msleep(1); - } - return EC_SUCCESS; -} void board_reset_pd_mcu(void) { @@ -348,13 +301,6 @@ void ppc_interrupt(enum gpio_signal signal) } } -void retimer_interrupt(enum gpio_signal signal) -{ - /* - * TODO(b/179513527): add USB-C support - */ -} - __override bool board_is_dts_port(int port) { return port == USBC_PORT_C0; |