Eric Lai has submitted this change. ( https://review.coreboot.org/c/coreboot/+/75615?usp=email )
Change subject: soc/amd/phoenix: Update USB device alias ......................................................................
soc/amd/phoenix: Update USB device alias
Follow 57263_FP8_MBDG_rev_0_92 Table.57 to update the alias. We can match the schematic for now.
BUG=b:285793461 TEST=USB still works.
Signed-off-by: Eric Lai eric_lai@quanta.corp-partner.google.com Change-Id: Id1058279fe5b0e3131608a0b9bbd708dbbde7e87 Reviewed-on: https://review.coreboot.org/c/coreboot/+/75615 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Ivy Jian ivy.jian@quanta.corp-partner.google.com Reviewed-by: Felix Held felix-coreboot@felixheld.de Reviewed-by: Jon Murphy jpmurphy@google.com Reviewed-by: Karthik Ramasubramanian kramasub@google.com --- M src/mainboard/amd/birman/devicetree_phoenix.cb M src/mainboard/amd/mayan/devicetree_phoenix.cb M src/mainboard/google/myst/variants/baseboard/devicetree.cb M src/soc/amd/phoenix/chipset.cb 4 files changed, 44 insertions(+), 44 deletions(-)
Approvals: Karthik Ramasubramanian: Looks good to me, approved Ivy Jian: Looks good to me, approved build bot (Jenkins): Verified Jon Murphy: Looks good to me, approved Felix Held: Looks good to me, approved
diff --git a/src/mainboard/amd/birman/devicetree_phoenix.cb b/src/mainboard/amd/birman/devicetree_phoenix.cb index f1b88a3..6cbb36f 100644 --- a/src/mainboard/amd/birman/devicetree_phoenix.cb +++ b/src/mainboard/amd/birman/devicetree_phoenix.cb @@ -217,16 +217,10 @@ chip drivers/usb/acpi device ref xhci_0_root_hub on chip drivers/usb/acpi - device ref usb3_port0 on end + device ref usb3_port2 on end end chip drivers/usb/acpi - device ref usb3_port1 on end - end - chip drivers/usb/acpi - device ref usb2_port0 on end - end - chip drivers/usb/acpi - device ref usb2_port1 on end + device ref usb3_port3 on end end chip drivers/usb/acpi device ref usb2_port2 on end @@ -237,6 +231,12 @@ chip drivers/usb/acpi device ref usb2_port4 on end end + chip drivers/usb/acpi + device ref usb2_port5 on end + end + chip drivers/usb/acpi + device ref usb2_port6 on end + end end end end @@ -244,10 +244,10 @@ chip drivers/usb/acpi device ref xhci_1_root_hub on chip drivers/usb/acpi - device ref usb3_port5 on end + device ref usb3_port7 on end end chip drivers/usb/acpi - device ref usb2_port5 on end + device ref usb2_port7 on end end end end diff --git a/src/mainboard/amd/mayan/devicetree_phoenix.cb b/src/mainboard/amd/mayan/devicetree_phoenix.cb index 766aeef..3a6d76c 100644 --- a/src/mainboard/amd/mayan/devicetree_phoenix.cb +++ b/src/mainboard/amd/mayan/devicetree_phoenix.cb @@ -199,16 +199,10 @@ chip drivers/usb/acpi device ref xhci_0_root_hub on chip drivers/usb/acpi - device ref usb3_port0 on end + device ref usb3_port2 on end end chip drivers/usb/acpi - device ref usb3_port1 on end - end - chip drivers/usb/acpi - device ref usb2_port0 on end - end - chip drivers/usb/acpi - device ref usb2_port1 on end + device ref usb3_port3 on end end chip drivers/usb/acpi device ref usb2_port2 on end @@ -219,6 +213,12 @@ chip drivers/usb/acpi device ref usb2_port4 on end end + chip drivers/usb/acpi + device ref usb2_port5 on end + end + chip drivers/usb/acpi + device ref usb2_port6 on end + end end end end @@ -226,10 +226,10 @@ chip drivers/usb/acpi device ref xhci_1_root_hub on chip drivers/usb/acpi - device ref usb3_port5 on end + device ref usb3_port7 on end end chip drivers/usb/acpi - device ref usb2_port5 on end + device ref usb2_port7 on end end end end diff --git a/src/mainboard/google/myst/variants/baseboard/devicetree.cb b/src/mainboard/google/myst/variants/baseboard/devicetree.cb index 2b6fa89..f53f5b7 100644 --- a/src/mainboard/google/myst/variants/baseboard/devicetree.cb +++ b/src/mainboard/google/myst/variants/baseboard/devicetree.cb @@ -246,7 +246,7 @@ 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 usb3_port0 on end + device ref usb3_port2 on end end chip drivers/usb/acpi register "desc" = ""USB3 Type-A Port A1 (DB)"" @@ -254,31 +254,31 @@ register "use_custom_pld" = "true" register "custom_pld" = "ACPI_PLD_TYPE_C(RIGHT, RIGHT, ACPI_PLD_GROUP(1, 2))" register "group" = "ACPI_PLD_GROUP(1, 2)" - device ref usb3_port1 on end + device ref usb3_port3 on end end chip drivers/usb/acpi register "desc" = ""USB2 Type-A Port A0 (MLB)"" 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 usb2_port0 on end + device ref usb2_port2 on end end chip drivers/usb/acpi register "desc" = ""USB2 Type-A Port A1 (DB)"" 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, 2))" - device ref usb2_port1 on end + device ref usb2_port3 on end end chip drivers/usb/acpi register "desc" = ""User-Facing Camera"" register "type" = "UPC_TYPE_INTERNAL" - device ref usb2_port2 on end + device ref usb2_port4 on end end chip drivers/usb/acpi register "desc" = ""World-Facing Camera"" register "type" = "UPC_TYPE_INTERNAL" - device ref usb2_port3 on end + device ref usb2_port5 on end end chip drivers/usb/acpi register "desc" = ""Bluetooth"" @@ -288,7 +288,7 @@ register "enable_delay_ms" = "500" register "enable_off_delay_ms" = "200" register "use_gpio_for_status" = "true" - device ref usb2_port4 on end + device ref usb2_port6 on end end end end @@ -306,14 +306,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(3, 1))" - device ref usb3_port6 on end + device ref usb3_port0 on end end chip drivers/usb/acpi register "desc" = ""USB4 Type-C Port C0 (MLB)"" 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(3, 1))" - device ref usb2_port6 on end + device ref usb2_port0 on end end end end @@ -327,14 +327,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(4, 1))" - device ref usb3_port7 on end + device ref usb3_port1 on end end chip drivers/usb/acpi register "desc" = ""USB2 Type-C Port C1 (MLB)"" 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(4, 1))" - device ref usb2_port7 on end + device ref usb2_port1 on end end end end diff --git a/src/soc/amd/phoenix/chipset.cb b/src/soc/amd/phoenix/chipset.cb index 97b7ec1..6525936 100644 --- a/src/soc/amd/phoenix/chipset.cb +++ b/src/soc/amd/phoenix/chipset.cb @@ -42,25 +42,25 @@ register "type" = "UPC_TYPE_HUB" device usb 0.0 alias xhci_0_root_hub off chip drivers/usb/acpi - device usb 3.0 alias usb3_port0 off end + device usb 3.0 alias usb3_port2 off end end chip drivers/usb/acpi - device usb 3.1 alias usb3_port1 off end + device usb 3.1 alias usb3_port3 off end end chip drivers/usb/acpi - device usb 2.0 alias usb2_port0 off end + device usb 2.0 alias usb2_port2 off end end chip drivers/usb/acpi - device usb 2.1 alias usb2_port1 off end + device usb 2.1 alias usb2_port3 off end end chip drivers/usb/acpi - device usb 2.2 alias usb2_port2 off end + device usb 2.2 alias usb2_port4 off end end chip drivers/usb/acpi - device usb 2.3 alias usb2_port3 off end + device usb 2.3 alias usb2_port5 off end end chip drivers/usb/acpi - device usb 2.4 alias usb2_port4 off end + device usb 2.4 alias usb2_port6 off end end end end @@ -70,10 +70,10 @@ register "type" = "UPC_TYPE_HUB" device usb 0.0 alias xhci_1_root_hub off chip drivers/usb/acpi - device usb 3.0 alias usb3_port5 off end + device usb 3.0 alias usb3_port7 off end end chip drivers/usb/acpi - device usb 2.0 alias usb2_port5 off end + device usb 2.0 alias usb2_port7 off end end end end @@ -96,10 +96,10 @@ register "type" = "UPC_TYPE_HUB" device usb 0.0 alias usb4_xhci_0_root_hub off chip drivers/usb/acpi - device usb 3.0 alias usb3_port6 off end + device usb 3.0 alias usb3_port0 off end end chip drivers/usb/acpi - device usb 2.0 alias usb2_port6 off end + device usb 2.0 alias usb2_port0 off end end end end @@ -109,10 +109,10 @@ register "type" = "UPC_TYPE_HUB" device usb 0.0 alias usb4_xhci_1_root_hub off chip drivers/usb/acpi - device usb 3.0 alias usb3_port7 off end + device usb 3.0 alias usb3_port1 off end end chip drivers/usb/acpi - device usb 2.0 alias usb2_port7 off end + device usb 2.0 alias usb2_port1 off end end end end