From c489a405d1c548dfdd1a24e095c55429d32a30f0 Mon Sep 17 00:00:00 2001
From: Felix Held <felix-coreboot@felixheld.de>
Date: Fri, 3 Feb 2023 18:02:24 +0100
Subject: 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 <felix-coreboot@felixheld.de>
Change-Id: I22384f58e245a1486793831d29d22e9c618f646c
Reviewed-on: https://review.coreboot.org/c/coreboot/+/72773
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Matt DeVillier <matt.devillier@amd.corp-partner.google.com>
---
 src/mainboard/amd/birman/devicetree_phoenix.cb | 25 ++++++++++++++-----------
 src/mainboard/amd/mayan/devicetree_phoenix.cb  | 25 ++++++++++++++-----------
 2 files changed, 28 insertions(+), 22 deletions(-)

(limited to 'src/mainboard')

diff --git a/src/mainboard/amd/birman/devicetree_phoenix.cb b/src/mainboard/amd/birman/devicetree_phoenix.cb
index d25ba378ff..9cebaab357 100644
--- a/src/mainboard/amd/birman/devicetree_phoenix.cb
+++ b/src/mainboard/amd/birman/devicetree_phoenix.cb
@@ -171,32 +171,35 @@ chip soc/amd/phoenix
 						chip drivers/usb/acpi
 							device ref usb3_port0 on end
 						end
+						chip drivers/usb/acpi
+							device ref usb3_port1 on end
+						end
 						chip drivers/usb/acpi
 							device ref usb2_port0 on end
 						end
 						chip drivers/usb/acpi
 							device ref usb2_port1 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_port2 on end
 						end
 						chip drivers/usb/acpi
-							device ref usb3_port3 on end
+							device ref usb2_port3 on end
 						end
 						chip drivers/usb/acpi
-							device ref usb2_port2 on end
+							device ref usb2_port4 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 usb2_port3 on end
+							device ref usb3_port5 on end
 						end
 						chip drivers/usb/acpi
-							device ref usb2_port4 on end
+							device ref usb2_port5 on end
 						end
 					end
 				end
diff --git a/src/mainboard/amd/mayan/devicetree_phoenix.cb b/src/mainboard/amd/mayan/devicetree_phoenix.cb
index 10b7329894..9d1a4b3a41 100644
--- a/src/mainboard/amd/mayan/devicetree_phoenix.cb
+++ b/src/mainboard/amd/mayan/devicetree_phoenix.cb
@@ -171,32 +171,35 @@ chip soc/amd/phoenix
 						chip drivers/usb/acpi
 							device ref usb3_port0 on end
 						end
+						chip drivers/usb/acpi
+							device ref usb3_port1 on end
+						end
 						chip drivers/usb/acpi
 							device ref usb2_port0 on end
 						end
 						chip drivers/usb/acpi
 							device ref usb2_port1 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_port2 on end
 						end
 						chip drivers/usb/acpi
-							device ref usb3_port3 on end
+							device ref usb2_port3 on end
 						end
 						chip drivers/usb/acpi
-							device ref usb2_port2 on end
+							device ref usb2_port4 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 usb2_port3 on end
+							device ref usb3_port5 on end
 						end
 						chip drivers/usb/acpi
-							device ref usb2_port4 on end
+							device ref usb2_port5 on end
 						end
 					end
 				end
-- 
cgit v1.2.3