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/intel/saddlebrook/devicetree.cb b/src/mainboard/intel/saddlebrook/devicetree.cb
index d888de4..067cb59 100644
--- a/src/mainboard/intel/saddlebrook/devicetree.cb
+++ b/src/mainboard/intel/saddlebrook/devicetree.cb
@@ -125,35 +125,6 @@
# USB related
register "SsicPortEnable" = "1"
- register "usb2_ports" = "{
- [0] = USB2_PORT_MID(OC_SKIP), /* OTG */
- [1] = USB2_PORT_MID(OC3), /* Touch Pad */
- [2] = USB2_PORT_MID(OC_SKIP), /* M.2 BT */
- [3] = USB2_PORT_MID(OC_SKIP), /* Touch Panel */
- [4] = USB2_PORT_MID(OC_SKIP), /* M.2 WWAN */
- [5] = USB2_PORT_MID(OC0), /* Front Panel */
- [6] = USB2_PORT_MID(OC0), /* Front Panel */
- [7] = USB2_PORT_MID(OC2), /* Stacked conn (lan + usb) */
- [8] = USB2_PORT_MID(OC2), /* Stacked conn (lan + usb) */
- [9] = USB2_PORT_MID(OC1), /* LAN MAGJACK */
- [10] = USB2_PORT_MID(OC1), /* LAN MAGJACK */
- [11] = USB2_PORT_MID(OC_SKIP), /* Finger print sensor */
- [12] = USB2_PORT_MID(OC4), /* USB 2 stack conn */
- [13] = USB2_PORT_MID(OC4), /* USB 2 stack conn */
- }"
-
- register "usb3_ports" = "{
- [0] = USB3_PORT_DEFAULT(OC5), /* OTG */
- [1] = USB3_PORT_DEFAULT(OC_SKIP), /* M.2 WWAN */
- [2] = USB3_PORT_DEFAULT(OC3), /* Flex */
- [3] = USB3_PORT_DEFAULT(OC_SKIP), /* IVCAM */
- [4] = USB3_PORT_DEFAULT(OC1), /* LAN MAGJACK */
- [5] = USB3_PORT_DEFAULT(OC0), /* Front Panel */
- [6] = USB3_PORT_DEFAULT(OC0), /* Front Panel */
- [7] = USB3_PORT_DEFAULT(OC2), /* Stack Conn */
- [8] = USB3_PORT_DEFAULT(OC2), /* Stack Conn */
- [9] = USB3_PORT_DEFAULT(OC1), /* LAN MAGJACK */
- }"
register "i2c_voltage[4]" = "I2C_VOLTAGE_1V8" # I2C4 is 1.8V
@@ -197,7 +168,37 @@
device domain 0 on
device ref igpu on end
- device ref south_xhci on end
+ device ref south_xhci on
+ register "usb2_ports" = "{
+ [0] = USB2_PORT_MID(OC_SKIP), /* OTG */
+ [1] = USB2_PORT_MID(OC3), /* Touch Pad */
+ [2] = USB2_PORT_MID(OC_SKIP), /* M.2 BT */
+ [3] = USB2_PORT_MID(OC_SKIP), /* Touch Panel */
+ [4] = USB2_PORT_MID(OC_SKIP), /* M.2 WWAN */
+ [5] = USB2_PORT_MID(OC0), /* Front Panel */
+ [6] = USB2_PORT_MID(OC0), /* Front Panel */
+ [7] = USB2_PORT_MID(OC2), /* Stacked conn (lan + usb) */
+ [8] = USB2_PORT_MID(OC2), /* Stacked conn (lan + usb) */
+ [9] = USB2_PORT_MID(OC1), /* LAN MAGJACK */
+ [10] = USB2_PORT_MID(OC1), /* LAN MAGJACK */
+ [11] = USB2_PORT_MID(OC_SKIP), /* Finger print sensor */
+ [12] = USB2_PORT_MID(OC4), /* USB 2 stack conn */
+ [13] = USB2_PORT_MID(OC4), /* USB 2 stack conn */
+ }"
+
+ register "usb3_ports" = "{
+ [0] = USB3_PORT_DEFAULT(OC5), /* OTG */
+ [1] = USB3_PORT_DEFAULT(OC_SKIP), /* M.2 WWAN */
+ [2] = USB3_PORT_DEFAULT(OC3), /* Flex */
+ [3] = USB3_PORT_DEFAULT(OC_SKIP), /* IVCAM */
+ [4] = USB3_PORT_DEFAULT(OC1), /* LAN MAGJACK */
+ [5] = USB3_PORT_DEFAULT(OC0), /* Front Panel */
+ [6] = USB3_PORT_DEFAULT(OC0), /* Front Panel */
+ [7] = USB3_PORT_DEFAULT(OC2), /* Stack Conn */
+ [8] = USB3_PORT_DEFAULT(OC2), /* Stack Conn */
+ [9] = USB3_PORT_DEFAULT(OC1), /* LAN MAGJACK */
+ }"
+ end
device ref thermal on end
device ref i2c0 on end
device ref i2c1 on end