From 005a14e1f39fdda58336cf79f511ddd6432388f1 Mon Sep 17 00:00:00 2001 From: Divya Sasidharan Date: Wed, 28 Oct 2020 15:26:34 -0700 Subject: Mux: Program retimer mux mode first Configure BB retimer first and then TCSS mux for the following boards 1. Adlrvpp 2. Boldar 3. Copano 4. Drobit 5. Halvor 6. Lingcod 7. Malefor 8. Terrador 9. Tglrvpu/y 10.Todor 11.Trondo 12.Volteer 13.Voxel BUG=b:166300460 BRANCH=None TEST=Able to configure the BB retimer before the TCSS mux Change-Id: Ife3074e3f45f00d3263eb0c5c2bea713db67541b Signed-off-by: Divya Sasidharan Signed-off-by: Ayushee Shah Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2506629 Reviewed-by: Keith Short --- board/terrador/board.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'board/terrador') diff --git a/board/terrador/board.c b/board/terrador/board.c index b1c8c66c5d..41aa79f804 100644 --- a/board/terrador/board.c +++ b/board/terrador/board.c @@ -334,11 +334,10 @@ BUILD_ASSERT(CONFIG_USB_PD_PORT_MAX_COUNT == USBC_PORT_COUNT); /******************************************************************************/ /* USBC mux configuration - Tiger Lake includes internal mux */ -struct usb_mux usbc1_usb4_db_retimer = { +struct usb_mux usbc1_tcss_usb_mux = { .usb_port = USBC_PORT_C1, - .driver = &bb_usb_retimer, - .i2c_port = I2C_PORT_USB_1_MIX, - .i2c_addr_flags = USBC_PORT_C1_BB_RETIMER_I2C_ADDR, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, }; struct usb_mux usb_muxes[] = { [USBC_PORT_C0] = { @@ -348,9 +347,10 @@ struct usb_mux usb_muxes[] = { }, [USBC_PORT_C1] = { .usb_port = USBC_PORT_C1, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, - .next_mux = &usbc1_usb4_db_retimer, + .next_mux = &usbc1_tcss_usb_mux, + .driver = &bb_usb_retimer, + .i2c_port = I2C_PORT_USB_1_MIX, + .i2c_addr_flags = USBC_PORT_C1_BB_RETIMER_I2C_ADDR, }, }; BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); -- cgit v1.2.1