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 <sean@starlabs.systems>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/84650
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Maxim Polyakov <max.senia.poliak@gmail.com>

9 files changed, 44 insertions, 43 deletions

diff --git a/src/mainboard/starlabs/byte_adl/variants/mk_ii/devicetree.cb b/src/mainboard/starlabs/byte_adl/variants/mk_ii/devicetree.cb
index 1d08df282d..efc1a9ced9 100644
--- a/src/mainboard/starlabs/byte_adl/variants/mk_ii/devicetree.cb
+++ b/src/mainboard/starlabs/byte_adl/variants/mk_ii/devicetree.cb
@@ -39,23 +39,23 @@ chip soc/intel/alderlake
 		end
 		device ref gna		on  end
 		device ref xhci		on
-			# Front panel USB Type C
+			# Front USB 3.0 Type-C
 			register "usb2_ports[0]"		= "USB2_PORT_MID(OC_SKIP)"
 			register "tcss_ports[0]"		= "TCSS_PORT_DEFAULT(OC_SKIP)"
 
-			# Back Top USB Type A [5]
+			# Back Top USB 3.0 Type-A
 			register "usb2_ports[1]"		= "USB2_PORT_MID(OC_SKIP)"
 			register "usb3_ports[2]"		= "USB3_PORT_DEFAULT(OC_SKIP)"
 
-			# Back Bottom USB Type A [6]
+			# Back Bottom USB 3.0 Type-A
 			register "usb2_ports[2]"		= "USB2_PORT_MID(OC_SKIP)"
 			register "usb3_ports[3]"		= "USB3_PORT_DEFAULT(OC_SKIP)"
 
-			# Front Left USB Type A [3]
+			# Front Left USB 3.0 Type-A
 			register "usb2_ports[5]"		= "USB2_PORT_MID(OC_SKIP)"
 			register "usb3_ports[1]"		= "USB3_PORT_DEFAULT(OC_SKIP)"
 
-			# Front Right USB Type A [2]
+			# Front Right USB 3.0 Type-A
 			register "usb2_ports[6]"		= "USB2_PORT_MID(OC_SKIP)"
 			register "usb3_ports[0]"		= "USB3_PORT_DEFAULT(OC_SKIP)"
 
diff --git a/src/mainboard/starlabs/lite/variants/glk/devicetree.cb b/src/mainboard/starlabs/lite/variants/glk/devicetree.cb
index 6c0269b9e4..c22133b971 100644
--- a/src/mainboard/starlabs/lite/variants/glk/devicetree.cb
+++ b/src/mainboard/starlabs/lite/variants/glk/devicetree.cb
@@ -76,15 +76,15 @@ chip soc/intel/apollolake
 			register "sata_ports_enable[0]"	= "1"
 		end
 		device ref xhci		on
-			# Motherboard USB Type C
+			# Motherboard USB 3.0 Type-C
 			register "usb2_port[0]"		= "PORT_EN(OC_SKIP)"
 			register "usb3_port[1]"		= "PORT_EN(OC_SKIP)"
 
-			# Motherboard USB 3.0
+			# Motherboard USB 3.0 Type-A
 			register "usb2_port[3]"		= "PORT_EN(OC1)"
 			register "usb3_port[0]"		= "PORT_EN(OC1)"
 
-			# Daughterboard USB 3.0
+			# Daughterboard USB 3.0 Type-A
 			register "usb2_port[5]"		= "PORT_EN(OC_SKIP)"
 			register "usb3_port[4]"		= "PORT_EN(OC_SKIP)"
 
diff --git a/src/mainboard/starlabs/lite/variants/glkr/devicetree.cb b/src/mainboard/starlabs/lite/variants/glkr/devicetree.cb
index bfe9d51a5a..4c79364592 100644
--- a/src/mainboard/starlabs/lite/variants/glkr/devicetree.cb
+++ b/src/mainboard/starlabs/lite/variants/glkr/devicetree.cb
@@ -76,15 +76,15 @@ chip soc/intel/apollolake
 			register "sata_ports_enable[0]"	= "1"
 		end
 		device ref xhci		on
-			# Motherboard USB Type C
+			# Motherboard USB 3.0 Type-C
 			register "usb2_port[0]"		= "PORT_EN(OC1)"
 			register "usb3_port[0]"		= "PORT_EN(OC1)"
 
-			# Motherboard USB 3.0
+			# Motherboard USB 3.0 Type-A
 			register "usb2_port[1]"		= "PORT_EN(OC0)"
 			register "usb3_port[1]"		= "PORT_EN(OC0)"
 
-			# Daughterboard USB 3.0
+			# Daughterboard USB 3.0 Type-A
 			register "usb2_port[3]"		= "PORT_EN(OC1)"
 			register "usb3_port[4]"		= "PORT_EN(OC1)"
 
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
diff --git a/src/mainboard/starlabs/starfighter/variants/rpl/devicetree.cb b/src/mainboard/starlabs/starfighter/variants/rpl/devicetree.cb
index 32775f6817..96c3295dbf 100644
--- a/src/mainboard/starlabs/starfighter/variants/rpl/devicetree.cb
+++ b/src/mainboard/starlabs/starfighter/variants/rpl/devicetree.cb
@@ -87,22 +87,22 @@ chip soc/intel/alderlake
 		end
 		device ref gna		on  end
 		device ref xhci		on
-			# Motherboard USB Type C #0
+			# Motherboard USB TBT Type-C #0
 			register "usb2_ports[0]"		= "USB2_PORT_MID(OC_SKIP)"
 			register "tcss_ports[0]"		= "TCSS_PORT_DEFAULT(OC_SKIP)"
 
-			# Motherboard USB Type-C #1
+			# Motherboard USB TBT Type-C #1
 			register "usb2_ports[1]"		= "USB2_PORT_MID(OC_SKIP)"
 			register "tcss_ports[1]"		= "TCSS_PORT_DEFAULT(OC_SKIP)"
 
-			# Motherboard USB Type-A #0
+			# Motherboard USB 3.0 Type-A
 			register "usb2_ports[2]"		= "USB2_PORT_MID(OC0)"
 			register "usb3_ports[0]"		= "USB3_PORT_DEFAULT(OC_SKIP)"
 
 			# Removable Webcam
 			register "usb2_ports[4]"		= "USB2_PORT_MID(OC_SKIP)"
 
-			# I/O Board USB Type-A
+			# Daughterboard USB 3.0 Type-A + USB 3.0 Type-A
 			register "usb2_ports[5]"		= "USB2_PORT_MID(OC0)"
 			register "usb3_ports[1]"		= "USB3_PORT_DEFAULT(OC_SKIP)"
 
@@ -136,14 +136,14 @@ chip soc/intel/alderlake
 						device ref usb3_port1 on end
 					end
 					chip drivers/usb/acpi
-						register "desc"		= ""Right USB Type-A""
-						register "type"		= "UPC_TYPE_USB3_A"
+						register "desc"		= ""USB 3.0 Hub""
+						register "type"		= "UPC_TYPE_HUB"
 						register "group"	= "ACPI_PLD_GROUP(0, 3)"
 						device ref usb2_port6 on end
 					end
 					chip drivers/usb/acpi
-						register "desc"		= ""Right USB Type-A""
-						register "type"		= "UPC_TYPE_USB3_A"
+						register "desc"		= ""USB 3.0 Hub""
+						register "type"		= "UPC_TYPE_HUB"
 						register "group"	= "ACPI_PLD_GROUP(0, 3)"
 						device ref usb3_port2 on end
 					end
diff --git a/src/mainboard/starlabs/starlite_adl/variants/mk_v/devicetree.cb b/src/mainboard/starlabs/starlite_adl/variants/mk_v/devicetree.cb
index c1af6475b4..bc50be2fca 100644
--- a/src/mainboard/starlabs/starlite_adl/variants/mk_v/devicetree.cb
+++ b/src/mainboard/starlabs/starlite_adl/variants/mk_v/devicetree.cb
@@ -36,15 +36,15 @@ chip soc/intel/alderlake
 		end
 		device ref gna		on  end
 		device ref xhci		on
-			# Primary USB Type C
+			# Top USB 3.0 Type-C
 			register "usb2_ports[0]"			= "USB2_PORT_MID(OC_SKIP)"
 			register "usb3_ports[2]"			= "USB3_PORT_DEFAULT(OC_SKIP)"
 
-			# Secondary USB Type C
+			# Bottom USB 3.0 Type-C
 			register "usb2_ports[1]"			= "USB2_PORT_MID(OC_SKIP)"
 			register "usb3_ports[0]"			= "USB3_PORT_DEFAULT(OC_SKIP)"
 
-			# Keyboard
+			# Detachable Keyboard + SD Card Reader
 			register "usb2_ports[2]"			= "USB2_PORT_MID(OC_SKIP)"
 
 			# Internal Webcam