From 840915bb8a934fac4830e1a029808e21741b0cac Mon Sep 17 00:00:00 2001 From: Sean Rhodes Date: Thu, 26 May 2022 20:46:35 +0100 Subject: mb/starlabs/labtop/cml: Organise USB ports by hardware port Group the USB ports by hardware ports, rather than separate USB 2.0 and 3.0 interfaces. Signed-off-by: Sean Rhodes Change-Id: Ie9bc6b3e20dddeb14cea195ef9a719432f66c6e1 Reviewed-on: https://review.coreboot.org/c/coreboot/+/64702 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons --- .../starlabs/labtop/variants/cml/devicetree.cb | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/mainboard/starlabs/labtop/variants/cml/devicetree.cb b/src/mainboard/starlabs/labtop/variants/cml/devicetree.cb index b3d7f34a4c..3bf0d7a74b 100644 --- a/src/mainboard/starlabs/labtop/variants/cml/devicetree.cb +++ b/src/mainboard/starlabs/labtop/variants/cml/devicetree.cb @@ -67,27 +67,26 @@ chip soc/intel/cannonlake device pci 12.5 off end # UFS SCS device pci 12.6 off end # GSPI #2 device pci 14.0 on # USB xHCI - ### USB 2.0 Devices # Motherboard USB Type C register "usb2_ports[0]" = "USB2_PORT_TYPE_C(OC_SKIP)" + register "usb3_ports[0]" = "USB3_PORT_DEFAULT(OC_SKIP)" + # Motherboard USB 3.0 register "usb2_ports[1]" = "USB2_PORT_MID(OC_SKIP)" + register "usb3_ports[1]" = "USB3_PORT_DEFAULT(OC_SKIP)" + # Daughterboard SD Card register "usb2_ports[3]" = "USB2_PORT_MID(OC_SKIP)" + # Daughterboard USB 3.0 register "usb2_ports[5]" = "USB2_PORT_MID(OC_SKIP)" + register "usb3_ports[2]" = "USB3_PORT_DEFAULT(OC_SKIP)" + # Internal Webcam register "usb2_ports[6]" = "USB2_PORT_MID(OC_SKIP)" + # Internal Bluetooth register "usb2_ports[9]" = "USB2_PORT_MID(OC_SKIP)" - - ### USB 3.0 Devices - # Motherboard USB Type C - register "usb3_ports[0]" = "USB3_PORT_DEFAULT(OC_SKIP)" - # Motherboard USB 3.0 - register "usb3_ports[1]" = "USB3_PORT_DEFAULT(OC_SKIP)" - # Daughterboard USB 3.0 - register "usb3_ports[2]" = "USB3_PORT_DEFAULT(OC_SKIP)" end device pci 14.1 off end # USB xDCI (OTG) device pci 14.3 on # CNVi -- cgit v1.2.3