From 220a47d12cfdd9eb742b4b4be2d5cd86645df02d Mon Sep 17 00:00:00 2001 From: Sean Rhodes Date: Mon, 30 May 2022 10:39:00 +0100 Subject: [PATCH] mb/starlabs/labtop/kbl: 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: Ib5fec81a7a04f2f5ab13784435944601902904d5 Reviewed-on: https://review.coreboot.org/c/coreboot/+/64794 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons --- .../labtop/variants/kbl/devicetree.cb | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/mainboard/starlabs/labtop/variants/kbl/devicetree.cb b/src/mainboard/starlabs/labtop/variants/kbl/devicetree.cb index 5c2c66aca0..3e7771d666 100644 --- a/src/mainboard/starlabs/labtop/variants/kbl/devicetree.cb +++ b/src/mainboard/starlabs/labtop/variants/kbl/devicetree.cb @@ -58,27 +58,26 @@ chip soc/intel/skylake device pci 02.0 on end # Integrated Graphics Device device pci 04.0 on end # SA Thermal Device 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 USB 3.0 register "usb2_ports[2]" = "USB2_PORT_MID(OC_SKIP)" + register "usb3_ports[2]" = "USB3_PORT_DEFAULT(OC_SKIP)" + # Internal Webcam register "usb2_ports[3]" = "USB2_PORT_MID(OC_SKIP)" - # Internal Bluetooth - register "usb2_ports[5]" = "USB2_PORT_MID(OC_SKIP)" + # Daughterboard SD Card register "usb2_ports[6]" = "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)" + # Internal Bluetooth + register "usb2_ports[9]" = "USB2_PORT_MID(OC_SKIP)" end device pci 14.1 off end # USB xDCI (OTG) device pci 14.2 on end # Thermal Subsystem