summaryrefslogtreecommitdiff
path: root/src/mainboard
diff options
context:
space:
mode:
authorMatt DeVillier <matt.devillier@amd.corp-partner.google.com>2023-05-23 15:02:55 -0500
committerFelix Held <felix-coreboot@felixheld.de>2023-05-25 13:04:31 +0000
commitdcabf1bd97a691f51c529e46c7bfba119404464c (patch)
tree26e5f0df38d9c99517964219233e51d134767cb6 /src/mainboard
parent432cb4035e9cd259af8688720b8ebfa918ca9eab (diff)
mb/google/skyrim/var/markarth: Fix USB port register scope
Commit d81ee3f1 ("mb/google/skyrim/var/markarth: Fix USB port ACPI generation") fixed the USB-A ports being double-nested, but neglected to move the chip driver registers up into the correct scope. While the generated ACPI is still correct, fix the register scope anyway to avoid confusion. BUG=b:283778468 BRANCH=skyrim TEST=build/boot markarth, dump ACPI, verify unchanged Change-Id: I5c1cd23c49b512f55e9e13b2164d30dfb7fb682d Signed-off-by: Matt DeVillier <matt.devillier@amd.corp-partner.google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/75388 Reviewed-by: Felix Held <felix-coreboot@felixheld.de> Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Eric Lai <eric_lai@quanta.corp-partner.google.com>
Diffstat (limited to 'src/mainboard')
-rw-r--r--src/mainboard/google/skyrim/variants/markarth/overridetree.cb22
1 files changed, 10 insertions, 12 deletions
diff --git a/src/mainboard/google/skyrim/variants/markarth/overridetree.cb b/src/mainboard/google/skyrim/variants/markarth/overridetree.cb
index 34d3f9d7fd..3de0ec84d5 100644
--- a/src/mainboard/google/skyrim/variants/markarth/overridetree.cb
+++ b/src/mainboard/google/skyrim/variants/markarth/overridetree.cb
@@ -50,20 +50,18 @@ chip soc/amd/mendocino
chip drivers/usb/acpi
device ref xhci_1_root_hub on # XHCI1 root hub
chip drivers/usb/acpi
- device ref usb3_port3 on # USB 3.1 port3
- register "desc" = ""USB3 Type-A Port A0 (MLB)""
- register "type" = "UPC_TYPE_USB3_A"
- register "use_custom_pld" = "true"
- register "custom_pld" = "ACPI_PLD_TYPE_A(LEFT, RIGHT, ACPI_PLD_GROUP(2, 2))"
- end # USB 3.1 port3
+ register "desc" = ""USB3 Type-A Port A0 (MLB)""
+ register "type" = "UPC_TYPE_USB3_A"
+ register "use_custom_pld" = "true"
+ register "custom_pld" = "ACPI_PLD_TYPE_A(LEFT, RIGHT, ACPI_PLD_GROUP(2, 2))"
+ device ref usb3_port3 on end # USB 3.1 port3
end
chip drivers/usb/acpi
- device ref usb2_port3 on # USB 2 port3
- register "desc" = ""USB2 Type-A Port A0 (MLB)""
- register "type" = "UPC_TYPE_USB3_A"
- register "use_custom_pld" = "true"
- register "custom_pld" = "ACPI_PLD_TYPE_A(LEFT, RIGHT, ACPI_PLD_GROUP(2, 2))"
- end # USB 2 port3
+ register "desc" = ""USB2 Type-A Port A0 (MLB)""
+ register "type" = "UPC_TYPE_USB3_A"
+ register "use_custom_pld" = "true"
+ register "custom_pld" = "ACPI_PLD_TYPE_A(LEFT, RIGHT, ACPI_PLD_GROUP(2, 2))"
+ device ref usb2_port3 on end # USB 2 port3
end
end # XHCI1 root hub
end