[S] Change in coreboot[main]: mb/starlabs/starbook_mtl: Fix USB port assignments/descriptions

[Sean Rhodes (Code Review)]

Sean Rhodes has submitted this change. ( https://review.coreboot.org/c/coreboot/+/86320?usp=email )

Change subject: mb/starlabs/starbook_mtl: Fix USB port assignments/descriptions
......................................................................

mb/starlabs/starbook_mtl: Fix USB port assignments/descriptions

Fix USB port assignments/descriptions to match actual topology.

TEST=build/boot Win11 on starlabs/starbook_mtl. Verify ports
match assignmented in devicetree using USBTreeview.

Change-Id: Ifb5ac4cf95c8f10706404479dea48ba20a90e286
Signed-off-by: Matt DeVillier 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/86320
Tested-by: build bot (Jenkins) 
Reviewed-by: Sean Rhodes 
---
M src/mainboard/starlabs/starbook/variants/mtl/devicetree.cb
1 file changed, 22 insertions(+), 22 deletions(-)

Approvals:
  Sean Rhodes: Looks good to me, approved
  build bot (Jenkins): Verified

diff --git a/src/mainboard/starlabs/starbook/variants/mtl/devicetree.cb b/src/mainboard/starlabs/starbook/variants/mtl/devicetree.cb
index a138438..d9d8dee 100644
--- a/src/mainboard/starlabs/starbook/variants/mtl/devicetree.cb
+++ b/src/mainboard/starlabs/starbook/variants/mtl/devicetree.cb
@@ -34,32 +34,32 @@
    		chip drivers/usb/acpi
    			device ref tcss_root_hub on
    				chip drivers/usb/acpi
-						register "desc"		= ""Front USB Type-C""
-						register "type"		= "UPC_TYPE_C_USB2_SS_SWITCH"
-						register "group"	= "ACPI_PLD_GROUP(0, 0)"
-						device ref tcss_usb3_port1 on end
-					end
-					chip drivers/usb/acpi
    					register "desc"		= ""Back USB Type-C""
    					register "type"		= "UPC_TYPE_C_USB2_SS_SWITCH"
+						register "group"	= "ACPI_PLD_GROUP(0, 0)"
+						device ref tcss_usb3_port0 on end
+					end
+					chip drivers/usb/acpi
+						register "desc"		= ""Front USB Type-C""
+						register "type"		= "UPC_TYPE_C_USB2_SS_SWITCH"
    					register "group"	= "ACPI_PLD_GROUP(0, 1)"
-						device ref tcss_usb3_port2 on end
+						device ref tcss_usb3_port1 on end
    				end
    			end
    		end
    	end
    	device ref gna		on  end
    	device ref xhci		on
-			# Motherboard USB 3.0 Type-C Front	9557 mil
+			# Motherboard USB 3.0 Type-C Back	7893 mil
    		register "usb2_ports[0]"		= "USB2_PORT_TYPE_C(OC_SKIP)"
    		register "tcss_ports[0]"		= "TCSS_PORT_DEFAULT(OC_SKIP)"

-			# Motherboard USB 3.0 Type-C Back	7893 mil
-			register "usb2_ports[1]"		= "USB2_PORT_TYPE_C(OC_SKIP)"
+			# Motherboard USB 3.0 Type-C Front	9557 mil
+			register "usb2_ports[2]"		= "USB2_PORT_TYPE_C(OC_SKIP)"
    		register "tcss_ports[1]"		= "TCSS_PORT_DEFAULT(OC_SKIP)"

# Motherboard USB 3.0 Type-A		8916 mil
-			register "usb2_ports[2]"		= "USB2_PORT_MID(OC_SKIP)"
+			register "usb2_ports[1]"		= "USB2_PORT_MID(OC_SKIP)"
    		register "usb3_ports[0]"		= "USB3_PORT_DEFAULT(OC_SKIP)"

# Daughterboard USB 3.0 Type-A		2229 mil
@@ -78,22 +78,22 @@
    		chip drivers/usb/acpi
    			device ref xhci_root_hub on
    				chip drivers/usb/acpi
-						register "desc"		= ""Front USB Type-C""
+						register "desc"		= ""Back USB Type-C""
    					register "type"		= "UPC_TYPE_C_USB2_SS_SWITCH"
    					register "group"	= "ACPI_PLD_GROUP(0, 0)"
    					device ref usb2_port1 on end
    				end
    				chip drivers/usb/acpi
-						register "desc"		= ""Back USB Type-C""
+						register "desc"		= ""Front USB Type-C""
    					register "type"		= "UPC_TYPE_C_USB2_SS_SWITCH"
    					register "group"	= "ACPI_PLD_GROUP(0, 1)"
-						device ref usb2_port2 on end
+						device ref usb2_port3 on end
    				end
    				chip drivers/usb/acpi
    					register "desc"		= ""Left USB Type-A""
    					register "type"		= "UPC_TYPE_USB3_A"
    					register "group"	= "ACPI_PLD_GROUP(0, 2)"
-						device ref usb2_port3 on end
+						device ref usb2_port2 on end
    				end
    				chip drivers/usb/acpi
    					register "desc"		= ""Left USB Type-A""
@@ -102,13 +102,13 @@
    					device ref usb3_port1 on end
    				end
    				chip drivers/usb/acpi
-						register "desc"		= ""Right USB Type-A""
+						register "desc"		= ""Right Rear USB Type-A""
    					register "type"		= "UPC_TYPE_USB3_A"
    					register "group"	= "ACPI_PLD_GROUP(0, 3)"
    					device ref usb2_port7 on end
    				end
    				chip drivers/usb/acpi
-						register "desc"		= ""Right USB Type-A""
+						register "desc"		= ""Right Rear USB Type-A""
    					register "type"		= "UPC_TYPE_USB3_A"
    					register "group"	= "ACPI_PLD_GROUP(0, 3)"
    					device ref usb3_port2 on end
@@ -120,8 +120,8 @@
    					device ref usb2_port5 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_port8 on end
    				end
@@ -236,12 +236,12 @@
    			device generic 0 on
    				chip drivers/intel/pmc_mux/conn
    					use usb2_port1 as usb2_port
-						use tcss_usb3_port1 as usb3_port
+						use tcss_usb3_port0 as usb3_port
    					device generic 0 alias conn0 on end
    				end
    				chip drivers/intel/pmc_mux/conn
-						use usb2_port2 as usb2_port
-						use tcss_usb3_port2 as usb3_port
+						use usb2_port3 as usb2_port
+						use tcss_usb3_port1 as usb3_port
    					device generic 1 alias conn1 on end
    				end
    			end