summaryrefslogtreecommitdiff
path: root/src/mainboard/intel/kblrvp/variants/rvp11
diff options
context:
space:
mode:
authorFelix Singer <felixsinger@posteo.net>2024-06-23 00:25:18 +0200
committerFelix Singer <felixsinger@posteo.net>2024-06-26 11:43:56 +0000
commit6c83a71b0a803c922b02b613e927d4c49b944c32 (patch)
tree176f163e7fdeaaf1032c853e87ce5571bd921be7 /src/mainboard/intel/kblrvp/variants/rvp11
parentc7c8cf2edd713fd578423bc043403ae4f91e2e29 (diff)
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>
Diffstat (limited to 'src/mainboard/intel/kblrvp/variants/rvp11')
-rw-r--r--src/mainboard/intel/kblrvp/variants/rvp11/overridetree.cb60
1 files changed, 31 insertions, 29 deletions
diff --git a/src/mainboard/intel/kblrvp/variants/rvp11/overridetree.cb b/src/mainboard/intel/kblrvp/variants/rvp11/overridetree.cb
index b580e76241..f2e569ddfd 100644
--- a/src/mainboard/intel/kblrvp/variants/rvp11/overridetree.cb
+++ b/src/mainboard/intel/kblrvp/variants/rvp11/overridetree.cb
@@ -46,35 +46,6 @@ chip soc/intel/skylake
# 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 "SataSalpSupport" = "1"
register "SataPortsEnable" = "{
@@ -107,6 +78,37 @@ chip soc/intel/skylake
}"
device domain 0 on
+ 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 sa_thermal off end
device ref i2c2 off end
device ref i2c3 off end