diff options
| author | Divya Sasidharan <divya.s.sasidharan@intel.com> | 2020-10-28 15:26:34 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-12-10 19:05:40 +0000 |
| commit | 005a14e1f39fdda58336cf79f511ddd6432388f1 (patch) | |
| tree | 3e4dce975001c25aa1945c9bf59f996f5957a199 /board/halvor | |
| parent | c5cb10fe676d95ecb02867edbc04d9d9e63fd015 (diff) | |
| download | chrome-ec-005a14e1f39fdda58336cf79f511ddd6432388f1.tar.gz | |
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 <divya.s.sasidharan@intel.com>
Signed-off-by: Ayushee Shah <ayushee.shah@intel.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2506629
Reviewed-by: Keith Short <keithshort@chromium.org>
Diffstat (limited to 'board/halvor')
| -rw-r--r-- | board/halvor/board.c | 43 |
1 files changed, 22 insertions, 21 deletions
diff --git a/board/halvor/board.c b/board/halvor/board.c index 0e983fefae..c49fe553dc 100644 --- a/board/halvor/board.c +++ b/board/halvor/board.c @@ -415,42 +415,43 @@ BUILD_ASSERT(CONFIG_USB_PD_PORT_MAX_COUNT == USBC_PORT_COUNT); /******************************************************************************/ /* USBC mux configuration - Tiger Lake includes internal mux */ -struct usb_mux usbc0_usb4_db_retimer = { +struct usb_mux usbc0_tcss_usb_mux = { .usb_port = USBC_PORT_C0, - .driver = &bb_usb_retimer, - .i2c_port = I2C_PORT_USB_1_MIX, - .i2c_addr_flags = USBC_PORT_C0_BB_RETIMER_I2C_ADDR, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, }; -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 usbc2_usb4_db_retimer = { +struct usb_mux usbc2_tcss_usb_mux = { .usb_port = USBC_PORT_C2, - .driver = &bb_usb_retimer, - .i2c_port = I2C_PORT_USB_1_MIX, - .i2c_addr_flags = USBC_PORT_C2_BB_RETIMER_I2C_ADDR, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, }; + struct usb_mux usb_muxes[] = { [USBC_PORT_C0] = { .usb_port = USBC_PORT_C0, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, - .next_mux = &usbc0_usb4_db_retimer, + .next_mux = &usbc0_tcss_usb_mux, + .driver = &bb_usb_retimer, + .i2c_port = I2C_PORT_USB_1_MIX, + .i2c_addr_flags = USBC_PORT_C0_BB_RETIMER_I2C_ADDR, }, [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, }, [USBC_PORT_C2] = { .usb_port = USBC_PORT_C2, - .driver = &virtual_usb_mux_driver, - .hpd_update = &virtual_hpd_update, - .next_mux = &usbc2_usb4_db_retimer, + .next_mux = &usbc2_tcss_usb_mux, + .driver = &bb_usb_retimer, + .i2c_port = I2C_PORT_USB_1_MIX, + .i2c_addr_flags = USBC_PORT_C2_BB_RETIMER_I2C_ADDR, }, }; BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); |