Eric Lai has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/75892?usp=email )
Change subject: soc/intel/meteorlake: Update tcss_usb3 alias ......................................................................
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 --- M src/mainboard/google/rex/variants/ovis/overridetree.cb M src/mainboard/google/rex/variants/rex0/overridetree.cb M src/mainboard/google/rex/variants/screebo/overridetree.cb M src/mainboard/intel/mtlrvp/variants/baseboard/mtlrvp_p/devicetree.cb M src/mainboard/intel/mtlrvp/variants/mtlrvp_p_ext_ec/overridetree.cb M src/soc/intel/meteorlake/chipset.cb 6 files changed, 37 insertions(+), 37 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/92/75892/1
diff --git a/src/mainboard/google/rex/variants/ovis/overridetree.cb b/src/mainboard/google/rex/variants/ovis/overridetree.cb index bb13833..e15a7c4 100644 --- a/src/mainboard/google/rex/variants/ovis/overridetree.cb +++ b/src/mainboard/google/rex/variants/ovis/overridetree.cb @@ -67,21 +67,21 @@ 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 @@ 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 @@ 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 4619cba..9a37ac4 100644 --- a/src/mainboard/google/rex/variants/rex0/overridetree.cb +++ b/src/mainboard/google/rex/variants/rex0/overridetree.cb @@ -323,14 +323,14 @@ 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 @@ 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 @@ 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 8669d95..e6c8a9c 100644 --- a/src/mainboard/google/rex/variants/screebo/overridetree.cb +++ b/src/mainboard/google/rex/variants/screebo/overridetree.cb @@ -256,14 +256,14 @@ 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 @@ 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 @@ 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 66f2179..05a61be 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 @@ 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 @@ 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 f51f18b..3f1579e 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 @@ 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 57d1205..6a9c26a 100644 --- a/src/soc/intel/meteorlake/chipset.cb +++ b/src/soc/intel/meteorlake/chipset.cb @@ -57,16 +57,16 @@ 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
-
Eric Lai (Code Review)