summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/mainboard/amd/birman/devicetree_phoenix.cb10
-rw-r--r--src/mainboard/amd/mayan/devicetree_phoenix.cb10
-rw-r--r--src/soc/amd/phoenix/chipset.cb20
3 files changed, 18 insertions, 22 deletions
diff --git a/src/mainboard/amd/birman/devicetree_phoenix.cb b/src/mainboard/amd/birman/devicetree_phoenix.cb
index 787a6f3253..d25ba378ff 100644
--- a/src/mainboard/amd/birman/devicetree_phoenix.cb
+++ b/src/mainboard/amd/birman/devicetree_phoenix.cb
@@ -204,16 +204,6 @@ chip soc/amd/phoenix
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
- chip drivers/usb/acpi
- register "type" = "UPC_TYPE_HUB"
- device usb 0.0 alias xhci_2_root_hub on
- chip drivers/usb/acpi
- device usb 2.0 alias usb2_port5 on end
- end
- end
- end
- end
end
end
diff --git a/src/mainboard/amd/mayan/devicetree_phoenix.cb b/src/mainboard/amd/mayan/devicetree_phoenix.cb
index 8f33dd16ed..10b7329894 100644
--- a/src/mainboard/amd/mayan/devicetree_phoenix.cb
+++ b/src/mainboard/amd/mayan/devicetree_phoenix.cb
@@ -204,16 +204,6 @@ chip soc/amd/phoenix
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
- chip drivers/usb/acpi
- register "type" = "UPC_TYPE_HUB"
- device usb 0.0 alias xhci_2_root_hub on
- chip drivers/usb/acpi
- device usb 2.0 alias usb2_port5 on end
- end
- end
- end
- end
end
end
diff --git a/src/soc/amd/phoenix/chipset.cb b/src/soc/amd/phoenix/chipset.cb
index f1c32faf1b..5763be88b1 100644
--- a/src/soc/amd/phoenix/chipset.cb
+++ b/src/soc/amd/phoenix/chipset.cb
@@ -25,6 +25,12 @@ chip soc/amd/phoenix
device pci 02.5 alias gpp_bridge_2_5 off ops amd_external_pcie_gpp_ops end
device pci 02.6 alias gpp_bridge_2_6 off ops amd_external_pcie_gpp_ops end
+ device pci 03.0 on end # Dummy Host Bridge, do not disable
+ device pci 03.1 alias usb4_pcie_bridge_0 off end
+
+ device pci 04.0 on end # Dummy Host Bridge, do not disable
+ device pci 04.1 alias usb4_pcie_bridge_1 off end
+
device pci 08.0 on end # Dummy Host Bridge, do not disable
device pci 08.1 alias gpp_bridge_a off # Internal GPP Bridge 0 to Bus A
ops amd_internal_pcie_gpp_ops
@@ -73,10 +79,20 @@ chip soc/amd/phoenix
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.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
+ device pci 0.1 alias ipu off end
+ 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_2 off end # Might also be a dummy device with different PCI DID
+ 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.5 alias usb4_router_0 off end
+ device pci 0.6 alias usb4_router_1 off end
end
device pci 14.0 alias smbus on ops amd_smbus_ops end # primary FCH function