mb/google/volteer/variants/copano: Describe USB ports in devicetree
Modify USB port to match schematics.
And assigned USB2 port to type-c use.
BUG=b:177481079
BRANCH=firmware-volteer-13672.B
TEST=emerge-volteer coreboot
Change-Id: I25412d16df8ad809c05635022c11bd8882d002c5
Signed-off-by: hao_chou <hao_chou@pegatron.corp-partner.google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/49980
Reviewed-by: Wayne3 Wang <wayne3_wang@pegatron.corp-partner.google.com>
Reviewed-by: Zhuohao Lee <zhuohao@google.com>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
diff --git a/src/mainboard/google/volteer/variants/copano/overridetree.cb b/src/mainboard/google/volteer/variants/copano/overridetree.cb
index 1192129..c331986 100644
--- a/src/mainboard/google/volteer/variants/copano/overridetree.cb
+++ b/src/mainboard/google/volteer/variants/copano/overridetree.cb
@@ -11,7 +11,6 @@
register "usb2_ports[4]" = "USB2_PORT_TYPE_C(OC0)" # Type-A / Type-C Port 0
register "usb3_ports[0]" = "USB3_PORT_DEFAULT(OC0)" # Type-A / Type-C Port 0
- register "usb3_ports[1]" = "USB3_PORT_DEFAULT(OC1)" # Type-A / Type-C Port 1
# Disable SRCCLKREQ1#
register "PcieClkSrcUsage[1]" = "PCIE_CLK_NOTUSED"
@@ -167,14 +166,16 @@
chip drivers/usb/acpi
register "desc" = ""USB3 Type-C Port C0 (MLB)""
register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
- register "group" = "ACPI_PLD_GROUP(3, 2)"
+ register "group" = "ACPI_PLD_GROUP(4, 2)"
device ref tcss_usb3_port1 on end
end
chip drivers/usb/acpi
register "desc" = ""USB3 Type-C Port C1 (MLB)""
register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
- register "group" = "ACPI_PLD_GROUP(2, 2)"
- device ref tcss_usb3_port2 on end
+ register "group" = "ACPI_PLD_GROUP(3, 2)"
+ device ref tcss_usb3_port2 on
+ probe DB_USB USB4_GEN3
+ end
end
end
end
@@ -186,24 +187,26 @@
register "desc" = ""USB2 Type-A Port A0 (MLB)""
register "type" = "UPC_TYPE_A"
register "group" = "ACPI_PLD_GROUP(1, 1)"
- device ref usb2_port2 on end
+ device ref usb2_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 "group" = "ACPI_PLD_GROUP(2, 1)"
- device ref usb2_port4 on end
+ register "group" = "ACPI_PLD_GROUP(3, 1)"
+ device ref usb2_port3 on
+ probe DB_USB USB4_GEN3
+ end
end
chip drivers/usb/acpi
register "desc" = ""USB2 Camera""
register "type" = "UPC_TYPE_INTERNAL"
- device ref usb2_port5 on end
+ device ref usb2_port4 on end
end
chip drivers/usb/acpi
register "desc" = ""USB2 Type-C Port C0 (MLB)""
register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
- register "group" = "ACPI_PLD_GROUP(3, 1)"
- device ref usb2_port9 on end
+ register "group" = "ACPI_PLD_GROUP(4, 1)"
+ device ref usb2_port5 on end
end
chip drivers/usb/acpi
register "desc" = ""USB2 Bluetooth""