[M] Change in coreboot[master]: soc/amd/phoenix/chipset.cb: update USB ports

[Felix Held (Code Review)]

Felix Held has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/72773 )

Change subject: soc/amd/phoenix/chipset.cb: update USB ports
......................................................................

soc/amd/phoenix/chipset.cb: update USB ports

Not exactly sure about the usb4_xhci controllers, but for now I assume
those will behave like any other XHCI controller.

Signed-off-by: Felix Held 
Change-Id: I22384f58e245a1486793831d29d22e9c618f646c
---
M src/soc/amd/phoenix/chipset.cb
1 file changed, 53 insertions(+), 13 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/73/72773/1

diff --git a/src/soc/amd/phoenix/chipset.cb b/src/soc/amd/phoenix/chipset.cb
index c6fb321..bd06a54 100644
--- a/src/soc/amd/phoenix/chipset.cb
+++ b/src/soc/amd/phoenix/chipset.cb
@@ -44,11 +44,23 @@
    						device usb 3.0 alias usb3_port0 off end
    					end
    					chip drivers/usb/acpi
+							device usb 3.1 alias usb3_port1 off end
+						end
+						chip drivers/usb/acpi
    						device usb 2.0 alias usb2_port0 off end
    					end
    					chip drivers/usb/acpi
    						device usb 2.1 alias usb2_port1 off end
    					end
+						chip drivers/usb/acpi
+							device usb 2.2 alias usb2_port2 off end
+						end
+						chip drivers/usb/acpi
+							device usb 2.3 alias usb2_port3 off end
+						end
+						chip drivers/usb/acpi
+							device usb 2.4 alias usb2_port4 off end
+						end
    				end
    			end
    		end
@@ -57,19 +69,10 @@
    				register "type" = "UPC_TYPE_HUB"
    				device usb 0.0 alias xhci_1_root_hub off
    					chip drivers/usb/acpi
-							device usb 3.0 alias usb3_port2 off end
+							device usb 3.0 alias usb3_port5 off end
    					end
    					chip drivers/usb/acpi
-							device usb 3.1 alias usb3_port3 off end
-						end
-						chip drivers/usb/acpi
-							device usb 2.0 alias usb2_port2 off end
-						end
-						chip drivers/usb/acpi
-							device usb 2.1 alias usb2_port3 off end
-						end
-						chip drivers/usb/acpi
-							device usb 2.2 alias usb2_port4 off end
+							device usb 2.0 alias usb2_port5 off end
    					end
    				end
    			end
@@ -88,8 +91,32 @@
    		ops amd_internal_pcie_gpp_ops
    		device pci 0.0 on end # dummy, do not disable
    		device pci 0.2 alias i2s_ac97 off end
-			device pci 0.3 alias usb4_xhci_0 off end
-			device pci 0.4 alias usb4_xhci_1 off end
+			device pci 0.3 alias usb4_xhci_0 off
+				chip drivers/usb/acpi
+					register "type" = "UPC_TYPE_HUB"
+					device usb 0.0 alias xhci_1_root_hub off
+						chip drivers/usb/acpi
+							device usb 3.0 alias usb3_port6 off end
+						end
+						chip drivers/usb/acpi
+							device usb 2.0 alias usb2_port6 off end
+						end
+					end
+				end
+			end
+			device pci 0.4 alias usb4_xhci_1 off
+				chip drivers/usb/acpi
+					register "type" = "UPC_TYPE_HUB"
+					device usb 0.0 alias xhci_1_root_hub off
+						chip drivers/usb/acpi
+							device usb 3.0 alias usb3_port7 off end
+						end
+						chip drivers/usb/acpi
+							device usb 2.0 alias usb2_port7 off end
+						end
+					end
+				end
+			end
    		device pci 0.5 alias usb4_router_0 off end
    		device pci 0.6 alias usb4_router_1 off end
    	end