constitution: modify usb function

Modify usb related function.

BUG=b:267539938
BRANCH=None
TEST=make BOARD=constitution

Change-Id: I92d672a8b4a5cbf04ae193de6eb5f84f051fc303
Signed-off-by: David Huang <david.huang@quanta.corp-partner.google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4286390
Reviewed-by: Pablo Ceballos <pceballos@chromium.org>
Reviewed-by: caveh jalali <caveh@chromium.org>
Reviewed-by: Matthew Ziegelbaum <ziegs@chromium.org>
Reviewed-by: Boris Mittelberg <bmbm@google.com>

5 files changed, 37 insertions, 155 deletions

diff --git a/board/constitution/board.c b/board/constitution/board.c
index f955ca783d..deb00f6c2c 100644
--- a/board/constitution/board.c
+++ b/board/constitution/board.c
@@ -133,13 +133,10 @@ static int32_t base_5v_power_z1;
 
 /* PP5000_S5 loads */
 #define PWR_S5_BASE_LOAD (5 * 1431)
-#define PWR_S5_FRONT_HIGH (5 * 1737)
-#define PWR_S5_FRONT_LOW (5 * 1055)
 #define PWR_S5_REAR_HIGH (5 * 1737)
 #define PWR_S5_REAR_LOW (5 * 1055)
 #define PWR_S5_HDMI (5 * 580)
 #define PWR_S5_MAX (5 * 10000)
-#define FRONT_DELTA (PWR_S5_FRONT_HIGH - PWR_S5_FRONT_LOW)
 #define REAR_DELTA (PWR_S5_REAR_HIGH - PWR_S5_REAR_LOW)
 
 /* PP5000_Z1 loads */
@@ -153,7 +150,6 @@ static int32_t base_5v_power_z1;
  */
 static void update_5v_usage(void)
 {
-	int front_ports = 0;
 	int rear_ports = 0;
 
 	/*
@@ -161,24 +157,10 @@ static void update_5v_usage(void)
 	 */
 	base_5v_power_s5 = PWR_S5_BASE_LOAD;
 	if (!gpio_get_level(GPIO_USB_A0_OC_ODL)) {
-		front_ports++;
-		base_5v_power_s5 += PWR_S5_FRONT_LOW;
-	}
-	if (!gpio_get_level(GPIO_USB_A1_OC_ODL)) {
-		front_ports++;
-		base_5v_power_s5 += PWR_S5_FRONT_LOW;
-	}
-	/*
-	 * Only 1 front port can run higher power at a time.
-	 */
-	if (front_ports > 0)
-		base_5v_power_s5 += PWR_S5_FRONT_HIGH - PWR_S5_FRONT_LOW;
-
-	if (!gpio_get_level(GPIO_USB_A2_OC_ODL)) {
 		rear_ports++;
 		base_5v_power_s5 += PWR_S5_REAR_LOW;
 	}
-	if (!gpio_get_level(GPIO_USB_A3_OC_ODL)) {
+	if (!gpio_get_level(GPIO_USB_A1_OC_ODL)) {
 		rear_ports++;
 		base_5v_power_s5 += PWR_S5_REAR_LOW;
 	}
@@ -269,8 +251,6 @@ static void board_init(void)
 	gpio_enable_interrupt(GPIO_HDMI_CONN_OC_ODL);
 	gpio_enable_interrupt(GPIO_USB_A0_OC_ODL);
 	gpio_enable_interrupt(GPIO_USB_A1_OC_ODL);
-	gpio_enable_interrupt(GPIO_USB_A2_OC_ODL);
-	gpio_enable_interrupt(GPIO_USB_A3_OC_ODL);
 }
 DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_DEFAULT);
 
@@ -303,7 +283,6 @@ void board_overcurrent_event(int port, int is_overcurrented)
  *
  * There are 3 throttles that can be applied (in priority order):
  *
- *  - Type A BC1.2 front port restriction (3W)
  *  - Type A BC1.2 rear port restriction (3W)
  *  - Type C PD (throttle to 1.5A if sourcing)
  *  - Turn on PROCHOT, which immediately throttles the CPU.
@@ -321,18 +300,13 @@ void board_overcurrent_event(int port, int is_overcurrented)
  *
  *  All measurements are in milliwatts.
  */
-#define THROT_TYPE_A_FRONT BIT(0)
-#define THROT_TYPE_A_REAR BIT(1)
-#define THROT_TYPE_C0 BIT(2)
-#define THROT_TYPE_C1 BIT(3)
-#define THROT_TYPE_C2 BIT(4)
-#define THROT_PROCHOT BIT(5)
+#define THROT_TYPE_A_REAR BIT(0)
+#define THROT_TYPE_C0 BIT(1)
+#define THROT_TYPE_C1 BIT(2)
+#define THROT_TYPE_C2 BIT(3)
+#define THROT_PROCHOT BIT(4)
 
 /*
- * Power gain if front USB A ports are limited.
- */
-#define POWER_GAIN_TYPE_A 3200
-/*
  * Power gain if Type C port is limited.
  */
 #define POWER_GAIN_TYPE_C 8800
@@ -427,17 +401,6 @@ static void power_monitor(void)
 			if (gap <= 0) {
 				new_state |= THROT_TYPE_A_REAR;
 				headroom_5v_s5 += REAR_DELTA;
-				if (!(current_state & THROT_TYPE_A_REAR))
-					gap += POWER_GAIN_TYPE_A;
-			}
-			/*
-			 * Limiting type-A power front ports.
-			 */
-			if (gap <= 0) {
-				new_state |= THROT_TYPE_A_FRONT;
-				headroom_5v_s5 += FRONT_DELTA;
-				if (!(current_state & THROT_TYPE_A_REAR))
-					gap += POWER_GAIN_TYPE_A;
 			}
 			/*
 			 * If the type-C port is sourcing power,
@@ -515,21 +478,13 @@ static void power_monitor(void)
 	}
 	if (headroom_5v_s5 < 0) {
 		/*
-		 * [1] If type A rear not already throttled, and power still
+		 * If type A rear not already throttled, and power still
 		 * needed, limit type A rear.
 		 */
 		if (!(new_state & THROT_TYPE_A_REAR) && headroom_5v_s5 < 0) {
 			headroom_5v_s5 += PWR_S5_REAR_HIGH - PWR_S5_REAR_LOW;
 			new_state |= THROT_TYPE_A_REAR;
 		}
-		/*
-		 * [2] If type A front not already throttled, and power still
-		 * needed, limit type A front.
-		 */
-		if (!(new_state & THROT_TYPE_A_FRONT) && headroom_5v_s5 < 0) {
-			headroom_5v_s5 += PWR_S5_FRONT_HIGH - PWR_S5_FRONT_LOW;
-			new_state |= THROT_TYPE_A_FRONT;
-		}
 	}
 	/*
 	 * Turn the throttles on or off if they have changed.
@@ -574,11 +529,5 @@ static void power_monitor(void)
 		gpio_set_level(GPIO_USB_A_LOW_PWR0_OD, typea_bc);
 		gpio_set_level(GPIO_USB_A_LOW_PWR1_OD, typea_bc);
 	}
-	if (diff & THROT_TYPE_A_FRONT) {
-		int typea_bc = (new_state & THROT_TYPE_A_FRONT) ? 1 : 0;
-
-		gpio_set_level(GPIO_USB_A_LOW_PWR2_OD, typea_bc);
-		gpio_set_level(GPIO_USB_A_LOW_PWR3_OD, typea_bc);
-	}
 	hook_call_deferred(&power_monitor_data, delay);
 }
diff --git a/board/constitution/board.h b/board/constitution/board.h
index 2cf9f24c61..b8d1a4ecbe 100644
--- a/board/constitution/board.h
+++ b/board/constitution/board.h
@@ -25,7 +25,7 @@
 #define CEC_GPIO_PULL_UP GPIO_HDMI_CEC_PULL_UP
 
 /* USB Type A Features */
-#define USB_PORT_COUNT 4
+#define USB_PORT_COUNT 2
 #define CONFIG_USB_PORT_POWER_DUMB
 
 /* USB Type C and USB PD defines */
@@ -39,8 +39,6 @@
 #define CONFIG_USB_PD_TCPM_RT1715
 #define CONFIG_USBC_RETIMER_INTEL_BB
 
-#define CONFIG_USBC_RETIMER_KB800X
-#define CONFIG_KB800X_CUSTOM_XBAR
 #define CONFIG_USBC_PPC_SYV682X
 #undef CONFIG_SYV682X_HV_ILIM
 #define CONFIG_SYV682X_HV_ILIM SYV682X_HV_ILIM_5_50
@@ -92,20 +90,16 @@
 #define GPIO_RECOVERY_L_2 GPIO_GSC_EC_RECOVERY_BTN_OD
 
 /* I2C Bus Configuration */
-
-#define I2C_PORT_DP_REDRIVER NPCX_I2C_PORT0_0
-
 #define I2C_PORT_USB_C0_C2_TCPC NPCX_I2C_PORT1_0
-#define I2C_PORT_USB_C1_TCPC NPCX_I2C_PORT4_1
+#define I2C_PORT_USB_C1_TCPC NPCX_I2C_PORT0_0
 
 #define I2C_PORT_USB_C0_C2_PPC NPCX_I2C_PORT2_0
-#define I2C_PORT_USB_C1_PPC NPCX_I2C_PORT6_1
+#define I2C_PORT_USB_C1_PPC NPCX_I2C_PORT4_1
 
 #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_C1_BC12 NPCX_I2C_PORT4_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_PSE NPCX_I2C_PORT5_0
 
@@ -116,8 +110,7 @@
 
 #define I2C_ADDR_MP2964_FLAGS 0x20
 
-#define USBC_PORT_C0_BB_RETIMER_I2C_ADDR 0x58
-#define USBC_PORT_C2_BB_RETIMER_I2C_ADDR 0x59
+#define USBC_PORT_C0_BB_RETIMER_I2C_ADDR 0x59
 
 /* Enabling Thunderbolt-compatible mode */
 #define CONFIG_USB_PD_TBT_COMPAT_MODE
diff --git a/board/constitution/gpio.inc b/board/constitution/gpio.inc
index 7e58ed9c2d..d4e2416443 100644
--- a/board/constitution/gpio.inc
+++ b/board/constitution/gpio.inc
@@ -18,22 +18,19 @@ GPIO_INT(SLP_S3_L,                   PIN(A, 5), GPIO_INT_BOTH, power_signal_inte
 GPIO_INT(SLP_SUS_L,                  PIN(F, 1), GPIO_INT_BOTH, power_signal_interrupt)
 GPIO_INT(SYS_SLP_S0IX_L,             PIN(D, 5), GPIO_INT_BOTH, power_signal_interrupt)
 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_C2_TCPC_INT_ODL,     PIN(A, 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_BC12_INT_ODL,        PIN(A, 2), 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)
+GPIO_INT(USB_C1_TCPC_INT_ODL,        PIN(E, 0), GPIO_INT_FALLING, tcpc_alert_event)
 GPIO_INT(USB_C2_BC12_INT_ODL,        PIN(8, 3), GPIO_INT_FALLING, bc12_interrupt)
 GPIO_INT(USB_C2_PPC_INT_ODL,         PIN(7, 0), GPIO_INT_FALLING, ppc_interrupt)
-GPIO_INT(USB_C2_RT_INT_ODL,          PIN(4, 1), GPIO_INT_FALLING, retimer_interrupt)
 GPIO_INT(BJ_ADP_PRESENT_ODL,         PIN(8, 2), GPIO_INT_BOTH | GPIO_PULL_UP, adp_connect_interrupt)
 GPIO_INT(EC_RECOVERY_BTN_OD,         PIN(2, 3), GPIO_INT_BOTH, button_interrupt)
 GPIO_INT(HDMI_CONN_OC_ODL,           PIN(2, 4), GPIO_INPUT | GPIO_INT_BOTH, port_ocp_interrupt)
 GPIO_INT(USB_A0_OC_ODL,              PIN(3, 1), GPIO_INPUT | GPIO_PULL_UP | GPIO_INT_BOTH, port_ocp_interrupt)
 GPIO_INT(USB_A1_OC_ODL,              PIN(3, 0), GPIO_INPUT | GPIO_PULL_UP | GPIO_INT_BOTH, port_ocp_interrupt)
-GPIO_INT(USB_A2_OC_ODL,              PIN(2, 7), GPIO_INPUT | GPIO_PULL_UP | GPIO_INT_BOTH, port_ocp_interrupt)
-GPIO_INT(USB_A3_OC_ODL,              PIN(2, 6), GPIO_INPUT | GPIO_PULL_UP | GPIO_INT_BOTH, port_ocp_interrupt)
 
 /* PSE controller */
 GPIO(EC_PSE_PWM_INT,                 PIN(9, 6), GPIO_INPUT)
@@ -96,29 +93,23 @@ GPIO(EC_I2C_LTC_SCL,                 PIN(3, 3), GPIO_INPUT)
 GPIO(EC_I2C_LTC_SDA,                 PIN(3, 6), GPIO_INPUT)
 GPIO(EC_I2C_MISC_SCL_R,              PIN(B, 3), GPIO_INPUT)
 GPIO(EC_I2C_MISC_SDA_R,              PIN(B, 2), GPIO_INPUT)
-GPIO(EC_I2C_DP_SCL,                  PIN(B, 5), GPIO_INPUT)
-GPIO(EC_I2C_DP_SDA,                  PIN(B, 4), GPIO_INPUT)
+GPIO(EC_I2C_USB_C1_TCPC_SCL,         PIN(B, 5), GPIO_INPUT)
+GPIO(EC_I2C_USB_C1_TCPC_SDA,         PIN(B, 4), GPIO_INPUT)
 GPIO(EC_I2C_USB_C0_C2_PPC_SCL,       PIN(9, 2), GPIO_INPUT)
 GPIO(EC_I2C_USB_C0_C2_PPC_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)
-GPIO(EC_I2C_USB_C1_MIX_SDA,          PIN(E, 3), GPIO_INPUT)
-GPIO(EC_I2C_USB_C1_TCPC_SCL,         PIN(F, 3), GPIO_INPUT)
-GPIO(EC_I2C_USB_C1_TCPC_SDA,         PIN(F, 2), GPIO_INPUT)
+GPIO(EC_I2C_USB_C1_PPC_SCL,          PIN(F, 3), GPIO_INPUT)
+GPIO(EC_I2C_USB_C1_PPC_SDA,          PIN(F, 2), GPIO_INPUT)
 
 /* USBA */
 GPIO(EN_PP5000_USBA,                 PIN(D, 7), GPIO_OUT_LOW)
 GPIO(USB_A0_STATUS_L,                PIN(2, 1), GPIO_INPUT)
 GPIO(USB_A1_STATUS_L,                PIN(2, 0), GPIO_INPUT)
-GPIO(USB_A2_STATUS_L,                PIN(1, 7), GPIO_INPUT)
-GPIO(USB_A3_STATUS_L,                PIN(1, 6), GPIO_INPUT)
 GPIO(USB_A_LOW_PWR0_OD,              PIN(1, 5), GPIO_INPUT | GPIO_PULL_DOWN)
 GPIO(USB_A_LOW_PWR1_OD,              PIN(1, 4), GPIO_INPUT | GPIO_PULL_DOWN)
-GPIO(USB_A_LOW_PWR2_OD,              PIN(1, 1), GPIO_INPUT | GPIO_PULL_DOWN)
-GPIO(USB_A_LOW_PWR3_OD,              PIN(1, 0), GPIO_INPUT | GPIO_PULL_DOWN)
 GPIO(USB_A_OC_SOC_L,                 PIN(8, 0), GPIO_OUT_HIGH)
 
 /* LED */
@@ -129,8 +120,6 @@ GPIO(LED_RED_L,                      PIN(C, 4), GPIO_OUT_LOW)
 /* USBC */
 GPIO(USB_C0_C2_TCPC_RST_ODL,         PIN(A, 7), GPIO_ODR_LOW)
 GPIO(USB_C1_FRS_EN,                  PIN(9, 4), GPIO_OUT_LOW)
-GPIO(USB_C1_RT_INT_ODL,              PIN(A, 0), GPIO_INPUT)
-GPIO(USB_C1_RT_RST_R_L,              PIN(0, 2), GPIO_OUT_LOW)
 
 /* GPIO02_P2 to PU */
 /* GPIO03_P2 to PU */
diff --git a/board/constitution/i2c.c b/board/constitution/i2c.c
index 436f84a44a..5a47c97c83 100644
--- a/board/constitution/i2c.c
+++ b/board/constitution/i2c.c
@@ -10,12 +10,12 @@
 /* I2C port map configuration */
 const struct i2c_port_t i2c_ports[] = {
 	{
-		/* I2C0 */
-		.name = "dp_redriver",
-		.port = I2C_PORT_DP_REDRIVER,
+		/* I2C0 C1 TCPC */
+		.name = "tcpc1",
+		.port = I2C_PORT_USB_C1_TCPC,
 		.kbps = 400,
-		.scl = GPIO_EC_I2C_DP_SCL,
-		.sda = GPIO_EC_I2C_DP_SDA,
+		.scl = GPIO_EC_I2C_USB_C1_TCPC_SCL,
+		.sda = GPIO_EC_I2C_USB_C1_TCPC_SDA,
 	},
 	{
 		/* I2C1 */
@@ -42,12 +42,12 @@ const struct i2c_port_t i2c_ports[] = {
 		.sda = GPIO_EC_I2C_USB_C0_C2_RT_SDA,
 	},
 	{
-		/* I2C4 C1 TCPC */
-		.name = "tcpc1",
-		.port = I2C_PORT_USB_C1_TCPC,
+		/* I2C4 */
+		.name = "ppc1",
+		.port = I2C_PORT_USB_C1_PPC,
 		.kbps = 400,
-		.scl = GPIO_EC_I2C_USB_C1_TCPC_SCL,
-		.sda = GPIO_EC_I2C_USB_C1_TCPC_SDA,
+		.scl = GPIO_EC_I2C_USB_C1_PPC_SCL,
+		.sda = GPIO_EC_I2C_USB_C1_PPC_SDA,
 	},
 	{
 		/* I2C5 */
@@ -58,14 +58,6 @@ const struct i2c_port_t i2c_ports[] = {
 		.sda = GPIO_EC_I2C_LTC_SDA,
 	},
 	{
-		/* I2C6 */
-		.name = "ppc1",
-		.port = I2C_PORT_USB_C1_PPC,
-		.kbps = 1000,
-		.scl = GPIO_EC_I2C_USB_C1_MIX_SCL,
-		.sda = GPIO_EC_I2C_USB_C1_MIX_SDA,
-	},
-	{
 		/* I2C7 */
 		.name = "eeprom",
 		.port = I2C_PORT_EEPROM,
diff --git a/board/constitution/usbc_config.c b/board/constitution/usbc_config.c
index a7a7cf682f..cc96a898b1 100644
--- a/board/constitution/usbc_config.c
+++ b/board/constitution/usbc_config.c
@@ -9,7 +9,6 @@
 #include "driver/bc12/pi3usb9201_public.h"
 #include "driver/ppc/syv682x_public.h"
 #include "driver/retimer/bb_retimer_public.h"
-#include "driver/retimer/kb800x.h"
 #include "driver/tcpm/nct38xx.h"
 #include "driver/tcpm/rt1715.h"
 #include "driver/tcpm/tcpci.h"
@@ -77,7 +76,7 @@ struct ppc_config_t ppc_chips[] = {
 	},
 	[USBC_PORT_C1] = {
 		.i2c_port = I2C_PORT_USB_C1_PPC,
-		.i2c_addr_flags = SYV682X_ADDR0_FLAGS,
+		.i2c_addr_flags = SYV682X_ADDR1_FLAGS,
 		.drv = &syv682x_drv,
 	},
 	[USBC_PORT_C2] = {
@@ -99,39 +98,6 @@ static const struct usb_mux_chain usbc0_tcss_usb_mux = {
 			.hpd_update = &virtual_hpd_update,
 		},
 };
-static const struct usb_mux_chain usbc1_tcss_usb_mux = {
-	.mux =
-		&(const struct usb_mux){
-			.usb_port = USBC_PORT_C1,
-			.driver = &virtual_usb_mux_driver,
-			.hpd_update = &virtual_hpd_update,
-		},
-};
-static const struct usb_mux_chain usbc2_tcss_usb_mux = {
-	.mux =
-		&(const struct usb_mux){
-			.usb_port = USBC_PORT_C2,
-			.driver = &virtual_usb_mux_driver,
-			.hpd_update = &virtual_hpd_update,
-		},
-};
-
-struct kb800x_control_t kb800x_control[] = {
-	[USBC_PORT_C0] = {
-	},
-	[USBC_PORT_C1] = {
-		.retimer_rst_gpio = GPIO_USB_C1_RT_RST_R_L,
-		.ss_lanes = {
-			[KB800X_A0] = KB800X_TX0, [KB800X_A1] = KB800X_RX0,
-			[KB800X_B0] = KB800X_RX1, [KB800X_B1] = KB800X_TX1,
-			[KB800X_C0] = KB800X_RX0, [KB800X_C1] = KB800X_TX0,
-			[KB800X_D0] = KB800X_TX1, [KB800X_D1] = KB800X_RX1,
-			}
-	},
-	[USBC_PORT_C2] = {
-	},
-};
-BUILD_ASSERT(ARRAY_SIZE(kb800x_control) == USBC_PORT_COUNT);
 
 const struct usb_mux_chain usb_muxes[] = {
 	[USBC_PORT_C0] = {
@@ -145,23 +111,18 @@ const struct usb_mux_chain usb_muxes[] = {
 		.next = &usbc0_tcss_usb_mux,
 	},
 	[USBC_PORT_C1] = {
-		.mux = &(const struct usb_mux) {
+		.mux = &(const struct usb_mux){
 			.usb_port = USBC_PORT_C1,
-			.driver = &kb800x_usb_mux_driver,
-			.i2c_port = I2C_PORT_USB_C1_MUX,
-			.i2c_addr_flags = KB800X_I2C_ADDR0_FLAGS,
+			.driver = &virtual_usb_mux_driver,
+			.hpd_update = &virtual_hpd_update,
 		},
-		.next = &usbc1_tcss_usb_mux,
 	},
 	[USBC_PORT_C2] = {
-		.mux = &(const struct usb_mux) {
+		.mux = &(const struct usb_mux){
 			.usb_port = USBC_PORT_C2,
-			.driver = &bb_usb_retimer,
-			.hpd_update = bb_retimer_hpd_update,
-			.i2c_port = I2C_PORT_USB_C0_C2_MUX,
-			.i2c_addr_flags = USBC_PORT_C2_BB_RETIMER_I2C_ADDR,
+			.driver = &virtual_usb_mux_driver,
+			.hpd_update = &virtual_hpd_update,
 		},
-		.next = &usbc2_tcss_usb_mux,
 	},
 };
 BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT);
@@ -174,7 +135,7 @@ const struct pi3usb9201_config_t pi3usb9201_bc12_chips[] = {
 	},
 	[USBC_PORT_C1] = {
 		.i2c_port = I2C_PORT_USB_C1_BC12,
-		.i2c_addr_flags = PI3USB9201_I2C_ADDR_3_FLAGS,
+		.i2c_addr_flags = PI3USB9201_I2C_ADDR_2_FLAGS,
 	},
 	[USBC_PORT_C2] = {
 		.i2c_port = I2C_PORT_USB_C0_C2_BC12,
@@ -270,7 +231,6 @@ void board_reset_pd_mcu(void)
 	 */
 
 	gpio_set_level(tcpc_rst, 0);
-	gpio_set_level(GPIO_USB_C1_RT_RST_R_L, 0);
 
 	/*
 	 * delay for power-on to reset-off and min. assertion time
@@ -279,7 +239,6 @@ void board_reset_pd_mcu(void)
 	msleep(20);
 
 	gpio_set_level(tcpc_rst, 1);
-	gpio_set_level(GPIO_USB_C1_RT_RST_R_L, 1);
 
 	/* wait for chips to come up */