diff options
| author | Felix Held <felix-coreboot@felixheld.de> | 2023-02-03 18:02:24 +0100 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2023-02-04 20:27:16 +0000 |
| commit | c489a405d1c548dfdd1a24e095c55429d32a30f0 (patch) | |
| tree | dbc6e6be5125f9eb07103ed08c8bf80e39870a0f | |
| parent | 0cf73ab9fd9dcbc366037948396145710406ef6c (diff) | |
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>
| -rw-r--r-- | src/mainboard/amd/birman/devicetree_phoenix.cb | 25 | ||||
| -rw-r--r-- | src/mainboard/amd/mayan/devicetree_phoenix.cb | 25 | ||||
| -rw-r--r-- | src/soc/amd/phoenix/chipset.cb | 53 |
3 files changed, 68 insertions, 35 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 @@ -172,31 +172,34 @@ chip soc/amd/phoenix 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 @@ -172,31 +172,34 @@ chip soc/amd/phoenix 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/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 @@ -45,11 +45,23 @@ chip soc/amd/phoenix 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 |