From 6c83a71b0a803c922b02b613e927d4c49b944c32 Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Sun, 23 Jun 2024 00:25:18 +0200
Subject: skl mainboards/dt: Move usb{2,3}_ports settings into XHCI device
 scope
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 .../google/fizz/variants/karma/overridetree.cb     | 38 ++++++++++++----------
 1 file changed, 21 insertions(+), 17 deletions(-)

(limited to 'src/mainboard/google/fizz/variants/karma/overridetree.cb')

diff --git a/src/mainboard/google/fizz/variants/karma/overridetree.cb b/src/mainboard/google/fizz/variants/karma/overridetree.cb
index d1dc46f45a..25b39f4fbe 100644
--- a/src/mainboard/google/fizz/variants/karma/overridetree.cb
+++ b/src/mainboard/google/fizz/variants/karma/overridetree.cb
@@ -1,28 +1,32 @@
 chip soc/intel/skylake
 
-	# Mapping of USB port # to device
-	#+----------------+-------+-----------------------------------+
-	#| Device         | Port# | Rev                               |
-	#+----------------+-------+-----------------------------------+
-	#| USB A Side     |   3   | 2/3                               |
-	#| SD Card        |   4   |                                   |
-	#| Camera         |   8   |                                   |
-	#| Touchsreen     |   10  |                                   |
-	#+----------------+-------+-----------------------------------+
-	register "usb2_ports[2]" = "USB2_PORT_MID(OC2)"		# Type-A Side
-	register "usb2_ports[3]" = "USB2_PORT_MID(OC_SKIP)"	# Card reader
-	register "usb2_ports[7]" = "USB2_PORT_MID(OC_SKIP)"     # Camera
-	register "usb2_ports[9]" = "USB2_PORT_MID(OC_SKIP)"	# Touchscreen
-
-	register "usb3_ports[2]" = "USB3_PORT_DEFAULT(OC2)"	# Type-A Side
-	register "usb3_ports[3]" = "USB3_PORT_DEFAULT(OC_SKIP)"	# Card reader
-
 	register "power_limits_config" = "{
 		.psys_pmax = 151,
 	}"
 
 	device domain 0 on
 		device ref south_xhci on
+			# Mapping of USB port # to device
+			#+----------------+-------+-----------------------------------+
+			#| Device         | Port# | Rev                               |
+			#+----------------+-------+-----------------------------------+
+			#| USB A Side     |   3   | 2/3                               |
+			#| SD Card        |   4   |                                   |
+			#| Camera         |   8   |                                   |
+			#| Touchsreen     |   10  |                                   |
+			#+----------------+-------+-----------------------------------+
+			register "usb2_ports" = "{
+				[2] = USB2_PORT_MID(OC2),	// Type-A Side
+				[3] = USB2_PORT_MID(OC_SKIP),	// Card reader
+				[7] = USB2_PORT_MID(OC_SKIP),	// Camera
+				[9] = USB2_PORT_MID(OC_SKIP),	// Touchscreen
+			}"
+
+			register "usb3_ports" = "{
+				[2] = USB3_PORT_DEFAULT(OC2),		// Type-A Side
+				[3] = USB3_PORT_DEFAULT(OC_SKIP),	// Card reader
+			}"
+
 			chip drivers/usb/acpi
 				device usb 0.0 on
 					chip drivers/usb/acpi
-- 
cgit v1.2.3