From c489a405d1c548dfdd1a24e095c55429d32a30f0 Mon Sep 17 00:00:00 2001 From: Felix Held Date: Fri, 3 Feb 2023 18:02:24 +0100 Subject: [PATCH] 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/72773 Tested-by: build bot (Jenkins) Reviewed-by: Matt DeVillier --- .../amd/birman/devicetree_phoenix.cb | 27 +++++----- src/mainboard/amd/mayan/devicetree_phoenix.cb | 27 +++++----- src/soc/amd/phoenix/chipset.cb | 53 ++++++++++++++----- 3 files changed, 70 insertions(+), 37 deletions(-) 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,24 +171,15 @@ 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 - end - chip drivers/usb/acpi - device ref usb3_port3 on end - end chip drivers/usb/acpi device ref usb2_port2 on end end @@ -201,6 +192,18 @@ chip soc/amd/phoenix 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_port5 on end + end + chip drivers/usb/acpi + device ref usb2_port5 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 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,24 +171,15 @@ 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 - end - chip drivers/usb/acpi - device ref usb3_port3 on end - end chip drivers/usb/acpi device ref usb2_port2 on end end @@ -201,6 +192,18 @@ chip soc/amd/phoenix 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_port5 on end + end + chip drivers/usb/acpi + device ref usb2_port5 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 diff --git a/src/soc/amd/phoenix/chipset.cb b/src/soc/amd/phoenix/chipset.cb index 5763be88b1..2d92f14903 100644 --- a/src/soc/amd/phoenix/chipset.cb +++ b/src/soc/amd/phoenix/chipset.cb @@ -44,12 +44,24 @@ chip soc/amd/phoenix chip drivers/usb/acpi 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 @@ -58,19 +70,10 @@ chip soc/amd/phoenix 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 @@ -89,8 +92,32 @@ chip soc/amd/phoenix 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 usb4_xhci_0_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 usb4_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