From 68f33d228ef2a79878042b7d62db63f73fa77561 Mon Sep 17 00:00:00 2001 From: Sean Rhodes Date: Thu, 3 Oct 2024 11:12:54 +0100 Subject: mb/starlabs/*: Enhance USB configuration and comments Some boards use hubs for devices, so correct the ACPI configuration for these ports. Also, add more information to the comments for the ports. Change-Id: I8472130aba8e777557cf68280fa0058dbeb77df9 Signed-off-by: Sean Rhodes Reviewed-on: https://review.coreboot.org/c/coreboot/+/84650 Tested-by: build bot (Jenkins) Reviewed-by: Maxim Polyakov --- src/mainboard/starlabs/starbook/variants/adl/devicetree.cb | 12 ++++++------ src/mainboard/starlabs/starbook/variants/cml/devicetree.cb | 6 +++--- src/mainboard/starlabs/starbook/variants/rpl/devicetree.cb | 13 +++++++------ src/mainboard/starlabs/starbook/variants/tgl/devicetree.cb | 12 ++++++------ 4 files changed, 22 insertions(+), 21 deletions(-) (limited to 'src/mainboard/starlabs/starbook') diff --git a/src/mainboard/starlabs/starbook/variants/adl/devicetree.cb b/src/mainboard/starlabs/starbook/variants/adl/devicetree.cb index e75934cac0..6fc820fe60 100644 --- a/src/mainboard/starlabs/starbook/variants/adl/devicetree.cb +++ b/src/mainboard/starlabs/starbook/variants/adl/devicetree.cb @@ -29,15 +29,15 @@ chip soc/intel/alderlake end device ref gna on end device ref xhci on - # Motherboard USB Type C + # Motherboard USB 3.0 Type-C register "usb2_ports[0]" = "USB2_PORT_MID(OC5)" register "usb3_ports[2]" = "USB3_PORT_DEFAULT(OC3)" - # Motherboard USB 3.0 + # Motherboard USB 3.0 Type-A register "usb2_ports[2]" = "USB2_PORT_MID(OC_SKIP)" register "usb3_ports[0]" = "USB3_PORT_DEFAULT(OC5)" - # Daughterboard USB 3.0 + # Daughterboard USB 3.0 Type-A register "usb2_ports[6]" = "USB2_PORT_MID(OC0)" register "usb3_ports[1]" = "USB3_PORT_DEFAULT(OC_SKIP)" @@ -47,7 +47,7 @@ chip soc/intel/alderlake # Fingerprint Reader register "usb2_ports[5]" = "USB2_PORT_MID(OC0)" - # Daughterboard SD Card + # Daughterboard USB 2.0 Type-A + SD Card Reader register "usb2_ports[3]" = "USB2_PORT_MID(OC_SKIP)" # Internal Bluetooth @@ -104,8 +104,8 @@ chip soc/intel/alderlake device ref usb2_port6 on end end chip drivers/usb/acpi - register "desc" = ""MicroSD Card Reader"" - register "type" = "UPC_TYPE_INTERNAL" + register "desc" = ""USB 2.0 Hub"" + register "type" = "UPC_TYPE_HUB" register "group" = "ACPI_PLD_GROUP(0, 5)" device ref usb2_port4 on end end diff --git a/src/mainboard/starlabs/starbook/variants/cml/devicetree.cb b/src/mainboard/starlabs/starbook/variants/cml/devicetree.cb index af7e18f610..d9c3285e04 100644 --- a/src/mainboard/starlabs/starbook/variants/cml/devicetree.cb +++ b/src/mainboard/starlabs/starbook/variants/cml/devicetree.cb @@ -38,18 +38,18 @@ chip soc/intel/cannonlake device domain 0 on device ref igpu on end device ref xhci on - # Motherboard USB Type C + # Motherboard USB 3.0 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 + # Motherboard USB 3.0 Type-A 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 + # Daughterboard USB 3.0 Type-A register "usb2_ports[5]" = "USB2_PORT_MID(OC_SKIP)" register "usb3_ports[2]" = "USB3_PORT_DEFAULT(OC_SKIP)" diff --git a/src/mainboard/starlabs/starbook/variants/rpl/devicetree.cb b/src/mainboard/starlabs/starbook/variants/rpl/devicetree.cb index 5de5f3c6cb..389bb5aa39 100644 --- a/src/mainboard/starlabs/starbook/variants/rpl/devicetree.cb +++ b/src/mainboard/starlabs/starbook/variants/rpl/devicetree.cb @@ -69,15 +69,15 @@ chip soc/intel/alderlake end device ref gna on end device ref xhci on - # Motherboard USB Type C + # Motherboard USB TBT Type-C register "usb2_ports[0]" = "USB2_PORT_MID(OC5)" register "tcss_ports[0]" = "TCSS_PORT_DEFAULT(OC_SKIP)" - # Motherboard USB 3.0 + # Motherboard USB 3.0 Type-A register "usb2_ports[2]" = "USB2_PORT_MID(OC_SKIP)" register "usb3_ports[0]" = "USB3_PORT_DEFAULT(OC5)" - # Daughterboard USB 3.0 + # Daughterboard USB 3.0 Type-A register "usb2_ports[6]" = "USB2_PORT_MID(OC0)" register "usb3_ports[1]" = "USB3_PORT_DEFAULT(OC_SKIP)" @@ -87,11 +87,12 @@ chip soc/intel/alderlake # Fingerprint Reader register "usb2_ports[5]" = "USB2_PORT_MID(OC0)" - # Daughterboard SD Card + # Daughterboard USB 2.0 Type-A + SD Card Reader register "usb2_ports[3]" = "USB2_PORT_MID(OC_SKIP)" # Internal Bluetooth register "usb2_ports[9]" = "USB2_PORT_MID(OC_SKIP)" + chip drivers/usb/acpi device ref xhci_root_hub on chip drivers/usb/acpi @@ -137,8 +138,8 @@ chip soc/intel/alderlake device ref usb2_port6 on end end chip drivers/usb/acpi - register "desc" = ""MicroSD Card Reader"" - register "type" = "UPC_TYPE_INTERNAL" + register "desc" = ""USB 2.0 Hub"" + register "type" = "UPC_TYPE_HUB" register "group" = "ACPI_PLD_GROUP(0, 5)" device ref usb2_port4 on end end diff --git a/src/mainboard/starlabs/starbook/variants/tgl/devicetree.cb b/src/mainboard/starlabs/starbook/variants/tgl/devicetree.cb index ca9e5cf795..3791a9d620 100644 --- a/src/mainboard/starlabs/starbook/variants/tgl/devicetree.cb +++ b/src/mainboard/starlabs/starbook/variants/tgl/devicetree.cb @@ -76,19 +76,19 @@ chip soc/intel/tigerlake end end device ref south_xhci on - # Motherboard USB Type C + # Motherboard USB TBT Type-C register "usb2_ports[0]" = "USB2_PORT_TYPE_C(OC_SKIP)" register "tcss_ports[0]" = "TCSS_PORT_DEFAULT(OC_SKIP)" - # Motherboard USB 3.0 + # Motherboard USB 3.0 Type-A register "usb2_ports[1]" = "USB2_PORT_MID(OC_SKIP)" register "usb3_ports[0]" = "USB3_PORT_DEFAULT(OC_SKIP)" - # Daughterboard USB 3.0 + # Daughterboard USB 3.0 Type-A register "usb2_ports[2]" = "USB2_PORT_MID(OC_SKIP)" register "usb3_ports[1]" = "USB3_PORT_DEFAULT(OC_SKIP)" - # Daughterboard SD Card + # Daughterboard USB 2.0 Type-A + SD Card Reader register "usb2_ports[5]" = "USB2_PORT_MID(OC_SKIP)" # Webcam @@ -136,8 +136,8 @@ chip soc/intel/tigerlake device ref usb2_port4 on end end chip drivers/usb/acpi - register "desc" = ""MicroSD Card Reader"" - register "type" = "UPC_TYPE_INTERNAL" + register "desc" = ""USB 2.0 Hub"" + register "type" = "UPC_TYPE_HUB" register "group" = "ACPI_PLD_GROUP(0, 4)" device ref usb2_port6 on end end -- cgit v1.2.3