tgl mainboards: Move usb{2,3}_ports settings into XHCI device scope
Change-Id: Ide5126c6e642ca16249efeaf46321724f2ddce9a
Signed-off-by: Felix Singer <felixsinger@posteo.net>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/83245
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Elyes Haouas <ehaouas@noos.fr>
diff --git a/src/mainboard/google/volteer/variants/elemi/overridetree.cb b/src/mainboard/google/volteer/variants/elemi/overridetree.cb
index 4adf76a..5eef9ef 100644
--- a/src/mainboard/google/volteer/variants/elemi/overridetree.cb
+++ b/src/mainboard/google/volteer/variants/elemi/overridetree.cb
@@ -66,15 +66,6 @@
},
}"
- # Disable M.2 WWAN
- register "usb2_ports[2]" = "USB2_PORT_EMPTY"
-
- # Type-A / Type-C C1
- register "usb2_ports[3]" = "USB2_PORT_TYPE_C(OC_SKIP)"
-
- # Type-A / Type-C C0
- register "usb2_ports[8]" = "USB2_PORT_TYPE_C(OC_SKIP)"
-
device domain 0 on
device ref dptf on
chip drivers/intel/dptf
@@ -146,6 +137,12 @@
end
end
device ref south_xhci on
+ register "usb2_ports" = "{
+ [2] = USB2_PORT_EMPTY, // Disable M.2 WWAN
+ [3] = USB2_PORT_TYPE_C(OC_SKIP), // Type-A / Type-C C1
+ [8] = USB2_PORT_TYPE_C(OC_SKIP), // Type-A / Type-C C0
+ }"
+
chip drivers/usb/acpi
device ref xhci_root_hub on
chip drivers/usb/acpi