skl mainboards/dt: Move usb{2,3}_ports settings into XHCI device scope
Change-Id: I22ba991a9d559b0ecc7b3ceddcfd099890dd6c3a
Signed-off-by: Felix Singer <felixsinger@posteo.net>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/83171
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Eric Lai <ericllai@google.com>
Reviewed-by: Marvin Evers <marvin.n.evers@gmail.com>
Reviewed-by: Erik van den Bogaert <ebogaert@eltan.com>
Reviewed-by: Michael Niewöhner <foss@mniewoehner.de>
Reviewed-by: Jonathon Hall <jonathon.hall@puri.sm>
diff --git a/src/mainboard/google/poppy/variants/rammus/devicetree.cb b/src/mainboard/google/poppy/variants/rammus/devicetree.cb
index 42528cf..823df7c 100644
--- a/src/mainboard/google/poppy/variants/rammus/devicetree.cb
+++ b/src/mainboard/google/poppy/variants/rammus/devicetree.cb
@@ -137,17 +137,6 @@
# RP 1, Enable Latency Tolerance Reporting Mechanism
register "PcieRpLtrEnable[0]" = "1"
- register "usb2_ports[0]" = "USB2_PORT_SHORT(OC0)" # Type-C Port 1
- register "usb2_ports[1]" = "USB2_PORT_LONG(OC3)" # Type-A Port
- register "usb2_ports[2]" = "USB2_PORT_SHORT(OC_SKIP)" # Bluetooth
- register "usb2_ports[4]" = "USB2_PORT_LONG(OC1)" # Type-C Port 2
- register "usb2_ports[6]" = "USB2_PORT_SHORT(OC_SKIP)" # H1
- register "usb2_ports[8]" = "USB2_PORT_SHORT(OC_SKIP)" # Camera
-
- register "usb3_ports[0]" = "USB3_PORT_DEFAULT(OC0)" # Type-C Port 1
- register "usb3_ports[1]" = "USB3_PORT_DEFAULT(OC1)" # Type-C Port 2
- register "usb3_ports[2]" = "USB3_PORT_DEFAULT(OC3)" # Type-A Port
-
# Intel Common SoC Config
#+-------------------+---------------------------+
#| Field | Value |
@@ -233,6 +222,20 @@
device ref sa_thermal on end
device ref imgu off end
device ref south_xhci on
+ register "usb2_ports" = "{
+ [0] = USB2_PORT_SHORT(OC0), // Type-C Port 1
+ [1] = USB2_PORT_LONG(OC3), // Type-A Port
+ [2] = USB2_PORT_SHORT(OC_SKIP), // Bluetooth
+ [4] = USB2_PORT_LONG(OC1), // Type-C Port 2
+ [6] = USB2_PORT_SHORT(OC_SKIP), // H1
+ [8] = USB2_PORT_SHORT(OC_SKIP), // Camera
+ }"
+
+ register "usb3_ports" = "{
+ [0] = USB3_PORT_DEFAULT(OC0), // Type-C Port 1
+ [1] = USB3_PORT_DEFAULT(OC1), // Type-C Port 2
+ [2] = USB3_PORT_DEFAULT(OC3), // Type-A Port
+ }"
chip drivers/usb/acpi
register "desc" = ""Root Hub""
register "type" = "UPC_TYPE_HUB"