summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--board/adlrvpp_ite/board.c56
-rw-r--r--board/boldar/board.c29
-rw-r--r--board/copano/board.c14
-rw-r--r--board/drobit/board.c29
-rw-r--r--board/halvor/board.c43
-rw-r--r--board/lingcod/board.c14
-rw-r--r--board/malefor/board.c14
-rw-r--r--board/terrador/board.c14
-rw-r--r--board/tglrvpu_ite/board.c28
-rw-r--r--board/todor/board.c15
-rw-r--r--board/trondo/board.c14
-rw-r--r--board/volteer/board.c15
-rw-r--r--board/voxel/board.c29
13 files changed, 160 insertions, 154 deletions
diff --git a/board/adlrvpp_ite/board.c b/board/adlrvpp_ite/board.c
index c9fe6db0ce..002b67d395 100644
--- a/board/adlrvpp_ite/board.c
+++ b/board/adlrvpp_ite/board.c
@@ -193,56 +193,56 @@ BUILD_ASSERT(ARRAY_SIZE(ppc_chips) == CONFIG_USB_PD_PORT_MAX_COUNT);
unsigned int ppc_cnt = ARRAY_SIZE(ppc_chips);
/* USB-C retimer Configuration */
-struct usb_mux usbc0_retimer = {
+struct usb_mux usbc0_tcss_usb_mux = {
.usb_port = TYPE_C_PORT_0,
- .driver = &bb_usb_retimer,
- .i2c_port = I2C_PORT_TYPEC_0,
- .i2c_addr_flags = I2C_PORT0_BB_RETIMER_ADDR,
+ .driver = &virtual_usb_mux_driver,
+ .hpd_update = &virtual_hpd_update,
};
-struct usb_mux usbc1_retimer = {
+struct usb_mux usbc1_tcss_usb_mux = {
.usb_port = TYPE_C_PORT_1,
- .driver = &bb_usb_retimer,
- .i2c_port = I2C_PORT_TYPEC_1,
- .i2c_addr_flags = I2C_PORT1_BB_RETIMER_ADDR,
+ .driver = &virtual_usb_mux_driver,
+ .hpd_update = &virtual_hpd_update,
};
-struct usb_mux usbc2_retimer = {
+struct usb_mux usbc2_tcss_usb_mux = {
.usb_port = TYPE_C_PORT_2,
- .driver = &bb_usb_retimer,
- .i2c_port = I2C_PORT_TYPEC_2,
- .i2c_addr_flags = I2C_PORT2_BB_RETIMER_ADDR,
+ .driver = &virtual_usb_mux_driver,
+ .hpd_update = &virtual_hpd_update,
};
-struct usb_mux usbc3_retimer = {
+struct usb_mux usbc3_tcss_usb_mux = {
.usb_port = TYPE_C_PORT_3,
- .driver = &bb_usb_retimer,
- .i2c_port = I2C_PORT_TYPEC_3,
- .i2c_addr_flags = I2C_PORT3_BB_RETIMER_ADDR,
+ .driver = &virtual_usb_mux_driver,
+ .hpd_update = &virtual_hpd_update,
};
/* USB muxes Configuration */
const struct usb_mux usb_muxes[] = {
[TYPE_C_PORT_0] = {
.usb_port = TYPE_C_PORT_0,
- .driver = &virtual_usb_mux_driver,
- .hpd_update = &virtual_hpd_update,
- .next_mux = &usbc0_retimer,
+ .next_mux = &usbc0_tcss_usb_mux,
+ .driver = &bb_usb_retimer,
+ .i2c_port = I2C_PORT_TYPEC_0,
+ .i2c_addr_flags = I2C_PORT0_BB_RETIMER_ADDR,
},
[TYPE_C_PORT_1] = {
.usb_port = TYPE_C_PORT_1,
- .driver = &virtual_usb_mux_driver,
- .hpd_update = &virtual_hpd_update,
- .next_mux = &usbc1_retimer,
+ .next_mux = &usbc1_tcss_usb_mux,
+ .driver = &bb_usb_retimer,
+ .i2c_port = I2C_PORT_TYPEC_1,
+ .i2c_addr_flags = I2C_PORT1_BB_RETIMER_ADDR,
},
[TYPE_C_PORT_2] = {
.usb_port = TYPE_C_PORT_2,
- .driver = &virtual_usb_mux_driver,
- .hpd_update = &virtual_hpd_update,
- .next_mux = &usbc2_retimer,
+ .next_mux = &usbc2_tcss_usb_mux,
+ .driver = &bb_usb_retimer,
+ .i2c_port = I2C_PORT_TYPEC_2,
+ .i2c_addr_flags = I2C_PORT2_BB_RETIMER_ADDR,
},
[TYPE_C_PORT_3] = {
.usb_port = TYPE_C_PORT_3,
- .driver = &virtual_usb_mux_driver,
- .hpd_update = &virtual_hpd_update,
- .next_mux = &usbc3_retimer,
+ .next_mux = &usbc3_tcss_usb_mux,
+ .driver = &bb_usb_retimer,
+ .i2c_port = I2C_PORT_TYPEC_3,
+ .i2c_addr_flags = I2C_PORT3_BB_RETIMER_ADDR,
},
};
BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == CONFIG_USB_PD_PORT_MAX_COUNT);
diff --git a/board/boldar/board.c b/board/boldar/board.c
index fbb1c9b662..3f73bb56b5 100644
--- a/board/boldar/board.c
+++ b/board/boldar/board.c
@@ -540,30 +540,31 @@ 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 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,
},
};
BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT);
diff --git a/board/copano/board.c b/board/copano/board.c
index b1c8c66c5d..41aa79f804 100644
--- a/board/copano/board.c
+++ b/board/copano/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);
diff --git a/board/drobit/board.c b/board/drobit/board.c
index 2b032faf58..722cdee8a1 100644
--- a/board/drobit/board.c
+++ b/board/drobit/board.c
@@ -345,30 +345,31 @@ BUILD_ASSERT(CONFIG_USB_PD_PORT_MAX_COUNT == USBC_PORT_COUNT);
/******************************************************************************/
/* USBC mux configuration - Tiger Lake includes internal mux */
-struct usb_mux usbc0_usb4_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_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] = {
.usb_port = USBC_PORT_C0,
- .driver = &virtual_usb_mux_driver,
- .hpd_update = &virtual_hpd_update,
- .next_mux = &usbc0_usb4_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_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);
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);
diff --git a/board/lingcod/board.c b/board/lingcod/board.c
index 7ae7cf6502..56e9fb067e 100644
--- a/board/lingcod/board.c
+++ b/board/lingcod/board.c
@@ -465,11 +465,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] = {
@@ -479,9 +478,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);
diff --git a/board/malefor/board.c b/board/malefor/board.c
index 829e930667..697ee909b9 100644
--- a/board/malefor/board.c
+++ b/board/malefor/board.c
@@ -518,11 +518,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] = {
@@ -532,9 +531,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);
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);
diff --git a/board/tglrvpu_ite/board.c b/board/tglrvpu_ite/board.c
index 97ecf7c89f..88f74054f3 100644
--- a/board/tglrvpu_ite/board.c
+++ b/board/tglrvpu_ite/board.c
@@ -112,33 +112,33 @@ const struct bb_usb_control bb_controls[] = {
BUILD_ASSERT(ARRAY_SIZE(bb_controls) == CONFIG_USB_PD_PORT_MAX_COUNT);
/* USB retimer Configuration */
-struct usb_mux usbc0_retimer = {
+struct usb_mux usbc0_tcss_usb_mux = {
.usb_port = TYPE_C_PORT_0,
- .driver = &bb_usb_retimer,
- .i2c_port = I2C_PORT0_BB_RETIMER,
- .i2c_addr_flags = I2C_PORT0_BB_RETIMER_ADDR,
+ .driver = &virtual_usb_mux_driver,
+ .hpd_update = &virtual_hpd_update,
};
-struct usb_mux usbc1_retimer = {
+struct usb_mux usbc1_tcss_usb_mux = {
.usb_port = TYPE_C_PORT_1,
- .driver = &bb_usb_retimer,
- .i2c_port = I2C_PORT1_BB_RETIMER,
- .i2c_addr_flags = I2C_PORT1_BB_RETIMER_ADDR,
+ .driver = &virtual_usb_mux_driver,
+ .hpd_update = &virtual_hpd_update,
};
/* USB muxes Configuration */
const struct usb_mux usb_muxes[] = {
[TYPE_C_PORT_0] = {
.usb_port = TYPE_C_PORT_0,
- .driver = &virtual_usb_mux_driver,
- .hpd_update = &virtual_hpd_update,
- .next_mux = &usbc0_retimer,
+ .next_mux = &usbc0_tcss_usb_mux,
+ .driver = &bb_usb_retimer,
+ .i2c_port = I2C_PORT0_BB_RETIMER,
+ .i2c_addr_flags = I2C_PORT0_BB_RETIMER_ADDR,
},
[TYPE_C_PORT_1] = {
.usb_port = TYPE_C_PORT_1,
- .driver = &virtual_usb_mux_driver,
- .hpd_update = &virtual_hpd_update,
- .next_mux = &usbc1_retimer,
+ .next_mux = &usbc1_tcss_usb_mux,
+ .driver = &bb_usb_retimer,
+ .i2c_port = I2C_PORT1_BB_RETIMER,
+ .i2c_addr_flags = I2C_PORT1_BB_RETIMER_ADDR,
},
};
BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == CONFIG_USB_PD_PORT_MAX_COUNT);
diff --git a/board/todor/board.c b/board/todor/board.c
index 85f03661ca..466aa58b68 100644
--- a/board/todor/board.c
+++ b/board/todor/board.c
@@ -360,12 +360,12 @@ 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] = {
.usb_port = USBC_PORT_C0,
@@ -374,9 +374,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,
+ .driver = &bb_usb_retimer,
+ .next_mux = &usbc1_tcss_usb_mux,
+ .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);
diff --git a/board/trondo/board.c b/board/trondo/board.c
index df924e7f27..6a4ba84c51 100644
--- a/board/trondo/board.c
+++ b/board/trondo/board.c
@@ -372,11 +372,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] = {
@@ -386,9 +385,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);
diff --git a/board/volteer/board.c b/board/volteer/board.c
index 972394d1c2..da30809410 100644
--- a/board/volteer/board.c
+++ b/board/volteer/board.c
@@ -557,12 +557,12 @@ 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] = {
.usb_port = USBC_PORT_C0,
@@ -571,9 +571,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,
+ .driver = &bb_usb_retimer,
+ .next_mux = &usbc1_tcss_usb_mux,
+ .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);
diff --git a/board/voxel/board.c b/board/voxel/board.c
index 1a8c47b2c3..a179529e2d 100644
--- a/board/voxel/board.c
+++ b/board/voxel/board.c
@@ -338,30 +338,31 @@ 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_0_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 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_0_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,
},
};
BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT);
View Lorry Controller Status