From 6c83a71b0a803c922b02b613e927d4c49b944c32 Mon Sep 17 00:00:00 2001 From: Felix Singer 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/83171 Tested-by: build bot (Jenkins) Reviewed-by: Eric Lai Reviewed-by: Marvin Evers Reviewed-by: Erik van den Bogaert Reviewed-by: Michael Niewöhner Reviewed-by: Jonathon Hall --- src/mainboard/intel/kunimitsu/devicetree.cb | 33 +++++++++++++++-------------- 1 file changed, 17 insertions(+), 16 deletions(-) (limited to 'src/mainboard/intel/kunimitsu') diff --git a/src/mainboard/intel/kunimitsu/devicetree.cb b/src/mainboard/intel/kunimitsu/devicetree.cb index d09a4d1810..45f71030c8 100644 --- a/src/mainboard/intel/kunimitsu/devicetree.cb +++ b/src/mainboard/intel/kunimitsu/devicetree.cb @@ -117,21 +117,6 @@ chip soc/intel/skylake register "PcieRpClkReqNumber[0]" = "1" register "PcieRpClkReqNumber[4]" = "2" - register "usb2_ports" = "{ - [0] = USB2_PORT_TYPE_C(OC0), /* Type-C Port 1 */ - [1] = USB2_PORT_TYPE_C(OC1), /* Type-C Port 2 */ - [2] = USB2_PORT_MID(OC_SKIP), /* Bluetooth */ - [4] = USB2_PORT_MID(OC2), /* Type-A Port (card) */ - [6] = USB2_PORT_FLEX(OC_SKIP), /* Camera */ - [8] = USB2_PORT_LONG(OC3), /* Type-A Port (board) */ - }" - - 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(OC2), /* Type-A Port (card) */ - [3] = USB3_PORT_DEFAULT(OC3), /* Type-A Port (board) */ - }" register "i2c_voltage[4]" = "I2C_VOLTAGE_1V8" # I2C4 is 1.8V @@ -164,7 +149,23 @@ chip soc/intel/skylake device domain 0 on device ref igpu on end device ref sa_thermal on end - device ref south_xhci on end + device ref south_xhci on + register "usb2_ports" = "{ + [0] = USB2_PORT_TYPE_C(OC0), /* Type-C Port 1 */ + [1] = USB2_PORT_TYPE_C(OC1), /* Type-C Port 2 */ + [2] = USB2_PORT_MID(OC_SKIP), /* Bluetooth */ + [4] = USB2_PORT_MID(OC2), /* Type-A Port (card) */ + [6] = USB2_PORT_FLEX(OC_SKIP), /* Camera */ + [8] = USB2_PORT_LONG(OC3), /* Type-A Port (board) */ + }" + + 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(OC2), /* Type-A Port (card) */ + [3] = USB3_PORT_DEFAULT(OC3), /* Type-A Port (board) */ + }" + end device ref thermal on end device ref i2c0 on chip drivers/i2c/generic -- cgit v1.2.3