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 <sean@starlabs.systems>
Change-Id: Ie9bc6b3e20dddeb14cea195ef9a719432f66c6e1
Reviewed-on: https://review.coreboot.org/c/coreboot/+/64702
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
This commit is contained in:
Sean Rhodes 2022-05-26 20:46:35 +01:00 committed by Felix Held
parent e07ac22487
commit 840915bb8a
1 changed files with 8 additions and 9 deletions

View File

@ -67,27 +67,26 @@ chip soc/intel/cannonlake
device pci 12.5 off end # UFS SCS device pci 12.5 off end # UFS SCS
device pci 12.6 off end # GSPI #2 device pci 12.6 off end # GSPI #2
device pci 14.0 on # USB xHCI device pci 14.0 on # USB xHCI
### USB 2.0 Devices
# Motherboard USB Type C # Motherboard USB Type C
register "usb2_ports[0]" = "USB2_PORT_TYPE_C(OC_SKIP)" register "usb2_ports[0]" = "USB2_PORT_TYPE_C(OC_SKIP)"
register "usb3_ports[0]" = "USB3_PORT_DEFAULT(OC_SKIP)"
# Motherboard USB 3.0 # Motherboard USB 3.0
register "usb2_ports[1]" = "USB2_PORT_MID(OC_SKIP)" register "usb2_ports[1]" = "USB2_PORT_MID(OC_SKIP)"
register "usb3_ports[1]" = "USB3_PORT_DEFAULT(OC_SKIP)"
# Daughterboard SD Card # Daughterboard SD Card
register "usb2_ports[3]" = "USB2_PORT_MID(OC_SKIP)" register "usb2_ports[3]" = "USB2_PORT_MID(OC_SKIP)"
# Daughterboard USB 3.0 # Daughterboard USB 3.0
register "usb2_ports[5]" = "USB2_PORT_MID(OC_SKIP)" register "usb2_ports[5]" = "USB2_PORT_MID(OC_SKIP)"
register "usb3_ports[2]" = "USB3_PORT_DEFAULT(OC_SKIP)"
# Internal Webcam # Internal Webcam
register "usb2_ports[6]" = "USB2_PORT_MID(OC_SKIP)" register "usb2_ports[6]" = "USB2_PORT_MID(OC_SKIP)"
# Internal Bluetooth # Internal Bluetooth
register "usb2_ports[9]" = "USB2_PORT_MID(OC_SKIP)" 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 end
device pci 14.1 off end # USB xDCI (OTG) device pci 14.1 off end # USB xDCI (OTG)
device pci 14.3 on # CNVi device pci 14.3 on # CNVi