soc/amd/glinda/chipset.cb: Update for glinda

This also updates the mainboards depending on it.

Change-Id: I1138f27bfd47f6fa70a0c2afcc65a5553a609d57
Signed-off-by: Maximilian Brune <maximilian.brune@9elements.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/84376
Reviewed-by: Martin L Roth <gaumless@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

3 files changed, 93 insertions, 58 deletions

diff --git a/src/mainboard/amd/birman/devicetree_glinda.cb b/src/mainboard/amd/birman/devicetree_glinda.cb
index dfcd176723..42011a1471 100644
--- a/src/mainboard/amd/birman/devicetree_glinda.cb
+++ b/src/mainboard/amd/birman/devicetree_glinda.cb
@@ -165,52 +165,52 @@ chip soc/amd/glinda
 			device ref gfx on end # Internal GPU (GFX)
 			device ref gfx_hda on end # Display HD Audio Controller (GFXAZ)
 			device ref crypto on end # Crypto Coprocessor
+			device ref acp on end # Audio Processor (ACP)
+		end
+		device ref gpp_bridge_c on  # Internal GPP Bridge 2 to Bus C
 			device ref xhci_0 on # USB 3.1 (USB0)
 				chip drivers/usb/acpi
 					device ref xhci_0_root_hub on
 						chip drivers/usb/acpi
-							device ref usb3_port0 on end
+							device ref usb3_port2 on end
 						end
 						chip drivers/usb/acpi
-							device ref usb2_port0 on end
+							device ref usb3_port3 on end
 						end
 						chip drivers/usb/acpi
-							device ref usb2_port1 on end
+							device ref usb2_port2 on end
 						end
-					end
-				end
-			end
-			device ref xhci_1 on # USB 3.1 (USB1)
-				chip drivers/usb/acpi
-					device ref xhci_1_root_hub on
 						chip drivers/usb/acpi
-							device ref usb3_port2 on end
+							device ref usb2_port3 on end
 						end
 						chip drivers/usb/acpi
-							device ref usb3_port3 on end
+							device ref usb2_port4 on end
 						end
 						chip drivers/usb/acpi
-							device ref usb2_port2 on end
+							device ref usb2_port5 on end
 						end
+					end
+				end
+			end
+			device ref usb4_xhci_0 on
+				chip drivers/usb/acpi
+					device ref usb4_xhci_0_root_hub on
 						chip drivers/usb/acpi
-							device ref usb2_port3 on end
+							device ref usb3_port0 on end
 						end
 						chip drivers/usb/acpi
-							device ref usb2_port4 on end
+							device ref usb2_port0 on end
 						end
 					end
 				end
 			end
-			device ref acp on end # Audio Processor (ACP)
-		end
-		device ref gpp_bridge_c on  # Internal GPP Bridge 2 to Bus C
-			device ref xhci_2 on
+			device ref usb4_xhci_1 on
 				ops xhci_pci_ops
 				chip drivers/usb/acpi
 					register "type" = "UPC_TYPE_HUB"
-					device usb 0.0 alias xhci_2_root_hub on
+					device ref usb4_xhci_1_root_hub on
 						chip drivers/usb/acpi
-							device usb 2.0 alias usb2_port5 on end
+							device ref usb2_port1 on end
 						end
 					end
 				end
diff --git a/src/mainboard/amd/birman_plus/devicetree_glinda.cb b/src/mainboard/amd/birman_plus/devicetree_glinda.cb
index 025680e2f1..2523d7c7b9 100644
--- a/src/mainboard/amd/birman_plus/devicetree_glinda.cb
+++ b/src/mainboard/amd/birman_plus/devicetree_glinda.cb
@@ -165,52 +165,52 @@ chip soc/amd/glinda
 			device ref gfx on end # Internal GPU (GFX)
 			device ref gfx_hda on end # Display HD Audio Controller (GFXAZ)
 			device ref crypto on end # Crypto Coprocessor
+			device ref acp on end # Audio Processor (ACP)
+		end
+		device ref gpp_bridge_c on  # Internal GPP Bridge 2 to Bus C
 			device ref xhci_0 on # USB 3.1 (USB0)
 				chip drivers/usb/acpi
 					device ref xhci_0_root_hub on
 						chip drivers/usb/acpi
-							device ref usb3_port0 on end
+							device ref usb3_port2 on end
 						end
 						chip drivers/usb/acpi
-							device ref usb2_port0 on end
+							device ref usb3_port3 on end
 						end
 						chip drivers/usb/acpi
-							device ref usb2_port1 on end
+							device ref usb2_port2 on end
 						end
-					end
-				end
-			end
-			device ref xhci_1 on # USB 3.1 (USB1)
-				chip drivers/usb/acpi
-					device ref xhci_1_root_hub on
 						chip drivers/usb/acpi
-							device ref usb3_port2 on end
+							device ref usb2_port3 on end
 						end
 						chip drivers/usb/acpi
-							device ref usb3_port3 on end
+							device ref usb2_port4 on end
 						end
 						chip drivers/usb/acpi
-							device ref usb2_port2 on end
+							device ref usb2_port5 on end
 						end
+					end
+				end
+			end
+			device ref usb4_xhci_0 on
+				chip drivers/usb/acpi
+					device ref usb4_xhci_0_root_hub on
 						chip drivers/usb/acpi
-							device ref usb2_port3 on end
+							device ref usb3_port0 on end
 						end
 						chip drivers/usb/acpi
-							device ref usb2_port4 on end
+							device ref usb2_port0 on end
 						end
 					end
 				end
 			end
-			device ref acp on end # Audio Processor (ACP)
-		end
-		device ref gpp_bridge_c on  # Internal GPP Bridge 2 to Bus C
-			device ref xhci_2 on
+			device ref usb4_xhci_1 on
 				ops xhci_pci_ops
 				chip drivers/usb/acpi
 					register "type" = "UPC_TYPE_HUB"
-					device usb 0.0 alias xhci_2_root_hub on
+					device ref usb4_xhci_1_root_hub on
 						chip drivers/usb/acpi
-							device usb 2.0 alias usb2_port5 on end
+							device ref usb2_port1 on end
 						end
 					end
 				end
diff --git a/src/soc/amd/glinda/chipset.cb b/src/soc/amd/glinda/chipset.cb
index 3d0e11931c..5a6541feb3 100644
--- a/src/soc/amd/glinda/chipset.cb
+++ b/src/soc/amd/glinda/chipset.cb
@@ -25,28 +25,38 @@ chip soc/amd/glinda
 			device pci 0.0 alias gfx off ops amd_graphics_ops end # Internal GPU (GFX)
 			device pci 0.1 alias gfx_hda off end # Display HD Audio Controller (GFXAZ)
 			device pci 0.2 alias crypto off end # Crypto Coprocessor
-			device pci 0.3 alias xhci_0 off
+			device pci 0.4 alias xhci_1 off
 				ops xhci_pci_ops
 				chip drivers/usb/acpi
 					register "type" = "UPC_TYPE_HUB"
-					device usb 0.0 alias xhci_0_root_hub off
-						chip drivers/usb/acpi
-							device usb 3.0 alias usb3_port0 off end
-						end
+					device usb 0.0 alias xhci_1_root_hub off
 						chip drivers/usb/acpi
-							device usb 2.0 alias usb2_port0 off end
+							device usb 3.0 alias usb3_port7 off end
 						end
 						chip drivers/usb/acpi
-							device usb 2.1 alias usb2_port1 off end
+							device usb 2.0 alias usb2_port7 off end
 						end
 					end
 				end
 			end
-			device pci 0.4 alias xhci_1 off
+			device pci 0.5 alias acp off ops amd_acp_ops end # Audio Processor (ACP)
+			device pci 0.6 alias hda off end # Audio Processor HD Audio Controller (main AZ)
+			device pci 0.7 alias mp2 off end # Sensor Fusion Hub (MP2)
+		end
+
+		device pci 08.2 alias gpp_bridge_b off # Internal GPP Bridge 1 to Bus B
+			ops amd_internal_pcie_gpp_ops
+			device pci 0.0 on end # dummy, do not disable
+		end
+
+		device pci 08.3 alias gpp_bridge_c off # Internal GPP Bridge 2 to Bus C
+			ops amd_internal_pcie_gpp_ops
+
+			device pci 0.0 alias xhci_0 off
 				ops xhci_pci_ops
 				chip drivers/usb/acpi
 					register "type" = "UPC_TYPE_HUB"
-					device usb 0.0 alias xhci_1_root_hub off
+					device usb 0.3 alias xhci_0_root_hub off
 						chip drivers/usb/acpi
 							device usb 3.0 alias usb3_port2 off end
 						end
@@ -62,18 +72,43 @@ chip soc/amd/glinda
 						chip drivers/usb/acpi
 							device usb 2.2 alias usb2_port4 off end
 						end
+						chip drivers/usb/acpi
+							device usb 2.3 alias usb2_port5 off end
+						end
+						chip drivers/usb/acpi
+							device usb 2.4 alias usb2_port6 off end
+						end
+					end
+				end
+			end
+			device pci 0.3 alias usb4_xhci_0 off
+				ops xhci_pci_ops
+				chip drivers/usb/acpi
+					register "type" = "UPC_TYPE_HUB"
+					device usb 0.0 alias usb4_xhci_0_root_hub off
+						chip drivers/usb/acpi
+							device usb 3.0 alias usb3_port0 off end
+						end
+						chip drivers/usb/acpi
+							device usb 2.0 alias usb2_port0 off end
+						end
+					end
+				end
+			end
+			device pci 0.4 alias usb4_xhci_1 off
+				ops xhci_pci_ops
+				chip drivers/usb/acpi
+					register "type" = "UPC_TYPE_HUB"
+					device usb 0.0 alias usb4_xhci_1_root_hub off
+						chip drivers/usb/acpi
+							device usb 3.0 alias usb3_port1 off end
+						end
+						chip drivers/usb/acpi
+							device usb 2.0 alias usb2_port1 off end
+						end
 					end
 				end
 			end
-			device pci 0.5 alias acp off ops amd_acp_ops end # Audio Processor (ACP)
-			device pci 0.6 alias hda off end # Audio Processor HD Audio Controller (main AZ)
-			device pci 0.7 alias mp2 off end # Sensor Fusion Hub (MP2)
-		end
-		device pci 08.2 alias gpp_bridge_b off ops amd_internal_pcie_gpp_ops end # Internal GPP Bridge 1 to Bus B
-		device pci 08.3 alias gpp_bridge_c off # Internal GPP Bridge 2 to Bus C
-			ops amd_internal_pcie_gpp_ops
-			device pci 0.0 alias xhci_2 off end # Might also be a dummy device with different PCI DID
-			# When using this as XHCI2, the mainboard devicetree needs to add ops xhci_pci_ops
 		end
 
 		device pci 14.0 alias smbus on ops amd_smbus_ops end # primary FCH function