summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatt DeVillier <matt.devillier@amd.corp-partner.google.com>2023-05-23 14:58:09 -0500
committerFelix Held <felix-coreboot@felixheld.de>2023-05-25 13:04:24 +0000
commit432cb4035e9cd259af8688720b8ebfa918ca9eab (patch)
tree7e0057835a566e499fd7f8761567ac53a7a5bb42 /src
parenta193308fabcfc9429c3d18ac16964c728d6b4942 (diff)
mb/google/skyrim/var/frostflow: Fix USB port register scope
Commit a539893c ("mb/google/skyrim/var/frostflow: 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 frostflow, dump ACPI, verify unchanged Change-Id: I3912fe1b7d3f2a07cb379928cd4f5d87100d3284 Signed-off-by: Matt DeVillier <matt.devillier@amd.corp-partner.google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/75387 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')
-rw-r--r--src/mainboard/google/skyrim/variants/frostflow/overridetree.cb22
1 files changed, 10 insertions, 12 deletions
diff --git a/src/mainboard/google/skyrim/variants/frostflow/overridetree.cb b/src/mainboard/google/skyrim/variants/frostflow/overridetree.cb
index 687d07abb9..4ccc4d235a 100644
--- a/src/mainboard/google/skyrim/variants/frostflow/overridetree.cb
+++ b/src/mainboard/google/skyrim/variants/frostflow/overridetree.cb
@@ -31,20 +31,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 A1 (DB)""
- register "type" = "UPC_TYPE_USB3_A"
- register "use_custom_pld" = "true"
- register "custom_pld" = "ACPI_PLD_TYPE_A(RIGHT, CENTER, ACPI_PLD_GROUP(3, 1))"
- end # USB 3.1 port3
+ register "desc" = ""USB3 Type-A Port A1 (DB)""
+ register "type" = "UPC_TYPE_USB3_A"
+ register "use_custom_pld" = "true"
+ register "custom_pld" = "ACPI_PLD_TYPE_A(RIGHT, CENTER, ACPI_PLD_GROUP(3, 1))"
+ 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 A1 (DB)""
- register "type" = "UPC_TYPE_USB3_A"
- register "use_custom_pld" = "true"
- register "custom_pld" = "ACPI_PLD_TYPE_A(RIGHT, CENTER, ACPI_PLD_GROUP(3, 1))"
- end # USB 2 port3
+ register "desc" = ""USB2 Type-A Port A1 (DB)""
+ register "type" = "UPC_TYPE_USB3_A"
+ register "use_custom_pld" = "true"
+ register "custom_pld" = "ACPI_PLD_TYPE_A(RIGHT, CENTER, ACPI_PLD_GROUP(3, 1))"
+ device ref usb2_port3 on end # USB 2 port3
end
end # XHCI1 root hub
end