soc/intel/meteorlake: Update tcss_usb3 alias

TCSS and TBT use the same lane on schematic. Update the port start
from 0 to match the Intel schematic. You can better follow the it
without convert the port number.

Signed-off-by: Eric Lai <eric_lai@quanta.corp-partner.google.com>
Change-Id: Ic6631dcbbd9f6c79c756b015425e2da778eb395e
Reviewed-on: https://review.coreboot.org/c/coreboot/+/75892
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Kapil Porwal <kapilporwal@google.com>
Reviewed-by: Subrata Banik <subratabanik@google.com>

8 files changed, 39 insertions, 39 deletions

diff --git a/src/mainboard/google/rex/variants/ovis/overridetree.cb b/src/mainboard/google/rex/variants/ovis/overridetree.cb
index bb138334cb..e15a7c4f5a 100644
--- a/src/mainboard/google/rex/variants/ovis/overridetree.cb
+++ b/src/mainboard/google/rex/variants/ovis/overridetree.cb
@@ -67,21 +67,21 @@ chip soc/intel/meteorlake
 						register "use_custom_pld" = "true"
 						register "custom_pld" = "ACPI_PLD_TYPE_C(FRONT, CENTER, ACPI_PLD_GROUP(1, 1))"
 						register "custom_pld.vertical_position" = "PLD_VERTICAL_POSITION_LOWER"
-						device ref tcss_usb3_port1 on end
+						device ref tcss_usb3_port0 on end
 					end
 					chip drivers/usb/acpi
 						register "desc" = ""USB3 Type-C Port C1""
 						register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
 						register "use_custom_pld" = "true"
 						register "custom_pld" = "ACPI_PLD_TYPE_C(BACK, RIGHT, ACPI_PLD_GROUP(2, 1))"
-						device ref tcss_usb3_port2 on end
+						device ref tcss_usb3_port1 on end
 					end
 					chip drivers/usb/acpi
 						register "desc" = ""USB3 Type-C Port C2""
 						register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
 						register "use_custom_pld" = "true"
 						register "custom_pld" = "ACPI_PLD_TYPE_C(FRONT, LEFT, ACPI_PLD_GROUP(1, 2))"
-						device ref tcss_usb3_port3 on end
+						device ref tcss_usb3_port2 on end
 					end
 				end
 			end
@@ -89,19 +89,19 @@ chip soc/intel/meteorlake
 		device ref tcss_dma0 on
 			chip drivers/intel/usb4/retimer
 				register "dfp[0].power_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_B22)"
-				use tcss_usb3_port1 as dfp[0].typec_port
+				use tcss_usb3_port0 as dfp[0].typec_port
 				device generic 0 on end
 			end
 			chip drivers/intel/usb4/retimer
 				register "dfp[1].power_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_B22)"
-				use tcss_usb3_port2 as dfp[1].typec_port
+				use tcss_usb3_port1 as dfp[1].typec_port
 				device generic 0 on end
 			end
 		end
 		device ref tcss_dma1 on
 			chip drivers/intel/usb4/retimer
 				register "dfp[0].power_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_B22)"
-				use tcss_usb3_port3 as dfp[0].typec_port
+				use tcss_usb3_port2 as dfp[0].typec_port
 				device generic 0 on end
 			end
 		end
@@ -197,17 +197,17 @@ chip soc/intel/meteorlake
 				device generic 0 on
 					chip drivers/intel/pmc_mux/conn
 						use usb2_port2 as usb2_port
-						use tcss_usb3_port1 as usb3_port
+						use tcss_usb3_port0 as usb3_port
 						device generic 0 alias conn0 on end
 					end
 					chip drivers/intel/pmc_mux/conn
 						use usb2_port1 as usb2_port
-						use tcss_usb3_port2 as usb3_port
+						use tcss_usb3_port1 as usb3_port
 						device generic 1 alias conn1 on end
 					end
 					chip drivers/intel/pmc_mux/conn
 						use usb2_port3 as usb2_port
-						use tcss_usb3_port3 as usb3_port
+						use tcss_usb3_port2 as usb3_port
 						device generic 2 alias conn2 on end
 					end
 				end
diff --git a/src/mainboard/google/rex/variants/rex0/overridetree.cb b/src/mainboard/google/rex/variants/rex0/overridetree.cb
index 4619cbac9b..9a37ac4725 100644
--- a/src/mainboard/google/rex/variants/rex0/overridetree.cb
+++ b/src/mainboard/google/rex/variants/rex0/overridetree.cb
@@ -323,14 +323,14 @@ chip soc/intel/meteorlake
 						register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
 						register "use_custom_pld" = "true"
 						register "custom_pld" = "ACPI_PLD_TYPE_C(LEFT, LEFT, ACPI_PLD_GROUP(1, 1))"
-						device ref tcss_usb3_port1 on end
+						device ref tcss_usb3_port0 on end
 					end
 					chip drivers/usb/acpi
 						register "desc" = ""USB3 Type-C Port C1 (DB)""
 						register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
 						register "use_custom_pld" = "true"
 						register "custom_pld" = "ACPI_PLD_TYPE_C(RIGHT, LEFT, ACPI_PLD_GROUP(2, 1))"
-						device ref tcss_usb3_port3 on end
+						device ref tcss_usb3_port2 on end
 					end
 				end
 			end
@@ -338,14 +338,14 @@ chip soc/intel/meteorlake
 		device ref tcss_dma0 on
 			chip drivers/intel/usb4/retimer
 				register "dfp[0].power_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_B22)"
-				use tcss_usb3_port1 as dfp[0].typec_port
+				use tcss_usb3_port0 as dfp[0].typec_port
 				device generic 0 on end
 			end
 		end
 		device ref tcss_dma1 on
 			chip drivers/intel/usb4/retimer
 				register "dfp[0].power_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_B22)"
-				use tcss_usb3_port3 as dfp[0].typec_port
+				use tcss_usb3_port2 as dfp[0].typec_port
 				device generic 0 on end
 			end
 		end
@@ -781,12 +781,12 @@ chip soc/intel/meteorlake
 				device generic 0 on
 					chip drivers/intel/pmc_mux/conn
 						use usb2_port2 as usb2_port
-						use tcss_usb3_port1 as usb3_port
+						use tcss_usb3_port0 as usb3_port
 						device generic 0 alias conn0 on end
 					end
 					chip drivers/intel/pmc_mux/conn
 						use usb2_port1 as usb2_port
-						use tcss_usb3_port3 as usb3_port
+						use tcss_usb3_port2 as usb3_port
 						device generic 1 alias conn1 on end
 					end
 				end
diff --git a/src/mainboard/google/rex/variants/screebo/overridetree.cb b/src/mainboard/google/rex/variants/screebo/overridetree.cb
index 8669d95e26..e6c8a9cfa1 100644
--- a/src/mainboard/google/rex/variants/screebo/overridetree.cb
+++ b/src/mainboard/google/rex/variants/screebo/overridetree.cb
@@ -256,14 +256,14 @@ chip soc/intel/meteorlake
 						register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
 						register "use_custom_pld" = "true"
 						register "custom_pld" = "ACPI_PLD_TYPE_C(RIGHT, RIGHT, ACPI_PLD_GROUP(1, 1))"
-						device ref tcss_usb3_port2 on end
+						device ref tcss_usb3_port1 on end
 					end
 					chip drivers/usb/acpi
 						register "desc" = ""USB3 Type-C Port C1 (DB)""
 						register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
 						register "use_custom_pld" = "true"
 						register "custom_pld" = "ACPI_PLD_TYPE_C(LEFT, LEFT, ACPI_PLD_GROUP(2, 1))"
-						device ref tcss_usb3_port4 on end
+						device ref tcss_usb3_port3 on end
 					end
 				end
 			end
@@ -271,14 +271,14 @@ chip soc/intel/meteorlake
 		device ref tcss_dma0 on
 			chip drivers/intel/usb4/retimer
 				register "dfp[0].power_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_B22)"
-				use tcss_usb3_port2 as dfp[0].typec_port
+				use tcss_usb3_port1 as dfp[0].typec_port
 				device generic 0 on end
 			end
 		end
 		device ref tcss_dma1 on
 			chip drivers/intel/usb4/retimer
 				register "dfp[0].power_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_B22)"
-				use tcss_usb3_port4 as dfp[0].typec_port
+				use tcss_usb3_port3 as dfp[0].typec_port
 				device generic 0 on end
 			end
 		end
@@ -518,12 +518,12 @@ chip soc/intel/meteorlake
 				device generic 0 on
 					chip drivers/intel/pmc_mux/conn
 						use usb2_port2 as usb2_port
-						use tcss_usb3_port2 as usb3_port
+						use tcss_usb3_port1 as usb3_port
 						device generic 0 alias conn0 on end
 					end
 					chip drivers/intel/pmc_mux/conn
 						use usb2_port1 as usb2_port
-						use tcss_usb3_port4 as usb3_port
+						use tcss_usb3_port3 as usb3_port
 						device generic 1 alias conn1 on end
 					end
 				end
diff --git a/src/mainboard/intel/mtlrvp/variants/baseboard/mtlrvp_p/devicetree.cb b/src/mainboard/intel/mtlrvp/variants/baseboard/mtlrvp_p/devicetree.cb
index 66f2179a99..05a61be1fe 100644
--- a/src/mainboard/intel/mtlrvp/variants/baseboard/mtlrvp_p/devicetree.cb
+++ b/src/mainboard/intel/mtlrvp/variants/baseboard/mtlrvp_p/devicetree.cb
@@ -220,25 +220,25 @@ chip soc/intel/meteorlake
 						register "desc" = ""USB3 Type-C Port C0""
 						register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
 						register "group" = "ACPI_PLD_GROUP(4, 2)"
-						device ref tcss_usb3_port1 on end
+						device ref tcss_usb3_port0 on end
 					end
 					chip drivers/usb/acpi
 						register "desc" = ""USB3 Type-C Port C1""
 						register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
 						register "group" = "ACPI_PLD_GROUP(3, 2)"
-						device ref tcss_usb3_port2 on end
+						device ref tcss_usb3_port1 on end
 					end
 					chip drivers/usb/acpi
 						register "desc" = ""USB3 Type-C Port C2""
 						register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
 						register "group" = "ACPI_PLD_GROUP(2, 2)"
-						device ref tcss_usb3_port3 on end
+						device ref tcss_usb3_port2 on end
 					end
 					chip drivers/usb/acpi
 						register "desc" = ""USB3 Type-C Port C3""
 						register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
 						register "group" = "ACPI_PLD_GROUP(1, 2)"
-						device ref tcss_usb3_port4 on end
+						device ref tcss_usb3_port3 on end
 					end
 				end
 			end
@@ -246,24 +246,24 @@ chip soc/intel/meteorlake
 		device ref tcss_dma0 on
 			chip drivers/intel/usb4/retimer
 				register "dfp[0].power_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_B21)"
-				use tcss_usb3_port1 as dfp[0].typec_port
+				use tcss_usb3_port0 as dfp[0].typec_port
 				device generic 0 on end
 			end
 			chip drivers/intel/usb4/retimer
 				register "dfp[1].power_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_B21)"
-				use tcss_usb3_port2 as dfp[1].typec_port
+				use tcss_usb3_port1 as dfp[1].typec_port
 				device generic 0 on end
 			end
 		end
 		device ref tcss_dma1 on
 			chip drivers/intel/usb4/retimer
 				register "dfp[0].power_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_B21)"
-				use tcss_usb3_port3 as dfp[0].typec_port
+				use tcss_usb3_port2 as dfp[0].typec_port
 				device generic 0 on end
 			end
 			chip drivers/intel/usb4/retimer
 				register "dfp[1].power_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_B21)"
-				use tcss_usb3_port4 as dfp[1].typec_port
+				use tcss_usb3_port3 as dfp[1].typec_port
 				device generic 0 on end
 			end
 		end
diff --git a/src/mainboard/intel/mtlrvp/variants/mtlrvp_p_ext_ec/overridetree.cb b/src/mainboard/intel/mtlrvp/variants/mtlrvp_p_ext_ec/overridetree.cb
index f51f18b564..3f1579e1cd 100644
--- a/src/mainboard/intel/mtlrvp/variants/mtlrvp_p_ext_ec/overridetree.cb
+++ b/src/mainboard/intel/mtlrvp/variants/mtlrvp_p_ext_ec/overridetree.cb
@@ -15,22 +15,22 @@ chip soc/intel/meteorlake
 				device generic 0 on
 					chip drivers/intel/pmc_mux/conn
 						use usb2_port1 as usb2_port
-						use tcss_usb3_port1 as usb3_port
+						use tcss_usb3_port0 as usb3_port
 						device generic 0 alias conn0 on end
 					end
 					chip drivers/intel/pmc_mux/conn
 						use usb2_port2 as usb2_port
-						use tcss_usb3_port2 as usb3_port
+						use tcss_usb3_port1 as usb3_port
 						device generic 1 alias conn1 on end
 					end
 					chip drivers/intel/pmc_mux/conn
 						use usb2_port3 as usb2_port
-						use tcss_usb3_port3 as usb3_port
+						use tcss_usb3_port2 as usb3_port
 						device generic 2 alias conn2 on end
 					end
 					chip drivers/intel/pmc_mux/conn
 						use usb2_port4 as usb2_port
-						use tcss_usb3_port4 as usb3_port
+						use tcss_usb3_port3 as usb3_port
 						device generic 3 alias conn3 on end
 					end
 				end
diff --git a/src/soc/intel/meteorlake/chipset.cb b/src/soc/intel/meteorlake/chipset.cb
index 57d1205887..6a9c26a10a 100644
--- a/src/soc/intel/meteorlake/chipset.cb
+++ b/src/soc/intel/meteorlake/chipset.cb
@@ -57,16 +57,16 @@ chip soc/intel/meteorlake
 				register "type" = "UPC_TYPE_HUB"
 				device usb 0.0 alias tcss_root_hub off
 					chip drivers/usb/acpi
-						device usb 3.0 alias tcss_usb3_port1 off end
+						device usb 3.0 alias tcss_usb3_port0 off end
 					end
 					chip drivers/usb/acpi
-						device usb 3.1 alias tcss_usb3_port2 off end
+						device usb 3.1 alias tcss_usb3_port1 off end
 					end
 					chip drivers/usb/acpi
-						device usb 3.2 alias tcss_usb3_port3 off end
+						device usb 3.2 alias tcss_usb3_port2 off end
 					end
 					chip drivers/usb/acpi
-						device usb 3.3 alias tcss_usb3_port4 off end
+						device usb 3.3 alias tcss_usb3_port3 off end
 					end
 				end
 			end
diff --git a/src/soc/intel/meteorlake/fsp_params.c b/src/soc/intel/meteorlake/fsp_params.c
index 790bf9ca11..30800e67a6 100644
--- a/src/soc/intel/meteorlake/fsp_params.c
+++ b/src/soc/intel/meteorlake/fsp_params.c
@@ -413,10 +413,10 @@ static void fill_fsps_tcss_params(FSP_S_CONFIG *s_cfg,
 		const struct soc_intel_meteorlake_config *config)
 {
 	const struct device *tcss_port_arr[] = {
+		DEV_PTR(tcss_usb3_port0),
 		DEV_PTR(tcss_usb3_port1),
 		DEV_PTR(tcss_usb3_port2),
 		DEV_PTR(tcss_usb3_port3),
-		DEV_PTR(tcss_usb3_port4),
 	};
 
 	s_cfg->TcssAuxOri = config->tcss_aux_ori;
diff --git a/src/soc/intel/meteorlake/retimer.c b/src/soc/intel/meteorlake/retimer.c
index 3fd9c2d43d..269620d0d1 100644
--- a/src/soc/intel/meteorlake/retimer.c
+++ b/src/soc/intel/meteorlake/retimer.c
@@ -10,10 +10,10 @@ int retimer_get_index_for_typec(uint8_t typec_port)
 	int ec_port = 0;
 
 	const struct device *tcss_port_arr[] = {
+		DEV_PTR(tcss_usb3_port0),
 		DEV_PTR(tcss_usb3_port1),
 		DEV_PTR(tcss_usb3_port2),
 		DEV_PTR(tcss_usb3_port3),
-		DEV_PTR(tcss_usb3_port4),
 	};
 
 	for (uint8_t i = 0; i < MAX_TYPE_C_PORTS; i++) {