summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFelix Held <felix-coreboot@felixheld.de>2021-05-31 20:07:02 +0200
committerFelix Held <felix-coreboot@felixheld.de>2021-06-01 20:37:26 +0000
commit5fd63bd016ae9b65dde36267c08e41473ba44942 (patch)
tree93da3343e0c697cd1bfc936904611cbc66f4493b /src
parent4fbab545b2a99407ff444a29730c443aee4f24db (diff)
mainboards using soc/amd/picasso: use aliases for remaining PCIe devices
Signed-off-by: Felix Held <felix-coreboot@felixheld.de> Change-Id: Id2bdce5871f57e9edb17f89cba61b5c5ae018566 Reviewed-on: https://review.coreboot.org/c/coreboot/+/55104 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Raul Rangel <rrangel@chromium.org>
Diffstat (limited to 'src')
-rw-r--r--src/mainboard/amd/bilby/devicetree.cb22
-rw-r--r--src/mainboard/amd/mandolin/variants/cereme/devicetree.cb22
-rw-r--r--src/mainboard/amd/mandolin/variants/mandolin/devicetree.cb22
-rw-r--r--src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb14
-rw-r--r--src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb16
-rw-r--r--src/mainboard/google/zork/variants/vilboz/overridetree.cb2
6 files changed, 49 insertions, 49 deletions
diff --git a/src/mainboard/amd/bilby/devicetree.cb b/src/mainboard/amd/bilby/devicetree.cb
index 10a5d2ee50..932d280b80 100644
--- a/src/mainboard/amd/bilby/devicetree.cb
+++ b/src/mainboard/amd/bilby/devicetree.cb
@@ -145,19 +145,19 @@ chip soc/amd/picasso
device ref gpp_bridge_1 on end
device ref gpp_bridge_4 on end # NVMe
device ref internal_bridge_a on
- device pci 0.0 on end # Internal GPU
- device pci 0.1 on end # Display HDA
- device pci 0.2 on end # Crypto Coprocessor
- device pci 0.3 on end # USB 3.1
- device pci 0.4 off end # USB 3.1
- device pci 0.5 on end # Audio
- device pci 0.6 on end # HDA
- device pci 0.7 on end # non-Sensor Fusion Hub device
+ device ref gfx on end # Internal GPU
+ device ref gfx_hda on end # Display HDA
+ device ref crypto on end # Crypto Coprocessor
+ device ref xhci_0 on end # USB 3.1
+ device ref xhci_1 off end # USB 3.1
+ device ref acp on end # Audio
+ device ref hda on end # HDA
+ device ref mp2 on end # non-Sensor Fusion Hub device
end
device ref internal_bridge_b on
- device pci 0.0 off end # AHCI
- device pci 0.1 off end # integrated Ethernet MAC
- device pci 0.2 off end # integrated Ethernet MAC
+ device ref sata off end # AHCI
+ device ref xgbe_0 off end # integrated Ethernet MAC
+ device ref xgbe_1 off end # integrated Ethernet MAC
end
device ref lpc_bridge on
chip superio/smsc/sio1036 # optional debug card
diff --git a/src/mainboard/amd/mandolin/variants/cereme/devicetree.cb b/src/mainboard/amd/mandolin/variants/cereme/devicetree.cb
index 9b218953fb..6a1a3bc0a7 100644
--- a/src/mainboard/amd/mandolin/variants/cereme/devicetree.cb
+++ b/src/mainboard/amd/mandolin/variants/cereme/devicetree.cb
@@ -143,19 +143,19 @@ chip soc/amd/picasso
device ref iommu on end
device ref gpp_bridge_0 on end # Bridge to PCIe Ethernet chip
device ref internal_bridge_a on
- device pci 0.0 on end # Internal GPU
- device pci 0.1 on end # Display HDA
- device pci 0.2 on end # Crypto Coprocessor
- device pci 0.3 on end # USB 3.1
- device pci 0.4 off end # USB 3.1
- device pci 0.5 on end # Audio
- device pci 0.6 on end # HDA
- device pci 0.7 on end # non-Sensor Fusion Hub device
+ device ref gfx on end # Internal GPU
+ device ref gfx_hda on end # Display HDA
+ device ref crypto on end # Crypto Coprocessor
+ device ref xhci_0 on end # USB 3.1
+ device ref xhci_1 off end # USB 3.1
+ device ref acp on end # Audio
+ device ref hda on end # HDA
+ device ref mp2 on end # non-Sensor Fusion Hub device
end
device ref internal_bridge_b on
- device pci 0.0 off end # AHCI
- device pci 0.1 off end # integrated Ethernet MAC
- device pci 0.2 off end # integrated Ethernet MAC
+ device ref sata off end # AHCI
+ device ref xgbe_0 off end # integrated Ethernet MAC
+ device ref xgbe_1 off end # integrated Ethernet MAC
end
device ref lpc_bridge on
chip superio/smsc/sio1036 # optional debug card
diff --git a/src/mainboard/amd/mandolin/variants/mandolin/devicetree.cb b/src/mainboard/amd/mandolin/variants/mandolin/devicetree.cb
index fef625f5d5..a12d318722 100644
--- a/src/mainboard/amd/mandolin/variants/mandolin/devicetree.cb
+++ b/src/mainboard/amd/mandolin/variants/mandolin/devicetree.cb
@@ -143,19 +143,19 @@ chip soc/amd/picasso
device ref iommu on end
device ref gpp_bridge_2 on end # Bridge to PCIe Ethernet chip
device ref internal_bridge_a on
- device pci 0.0 on end # Internal GPU
- device pci 0.1 on end # Display HDA
- device pci 0.2 on end # Crypto Coprocessor
- device pci 0.3 on end # USB 3.1
- device pci 0.4 on end # USB 3.1
- device pci 0.5 on end # Audio
- device pci 0.6 on end # HDA
- device pci 0.7 on end # non-Sensor Fusion Hub device
+ device ref gfx on end # Internal GPU
+ device ref gfx_hda on end # Display HDA
+ device ref crypto on end # Crypto Coprocessor
+ device ref xhci_0 on end # USB 3.1
+ device ref xhci_1 on end # USB 3.1
+ device ref acp on end # Audio
+ device ref hda on end # HDA
+ device ref mp2 on end # non-Sensor Fusion Hub device
end
device ref internal_bridge_b on
- device pci 0.0 on end # AHCI
- device pci 0.1 off end # integrated Ethernet MAC
- device pci 0.2 off end # integrated Ethernet MAC
+ device ref sata on end # AHCI
+ device ref xgbe_0 off end # integrated Ethernet MAC
+ device ref xgbe_1 off end # integrated Ethernet MAC
end
device ref lpc_bridge on
chip superio/smsc/sio1036 # optional debug card
diff --git a/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb b/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb
index 57710c2b86..f3ad3295f3 100644
--- a/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb
+++ b/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb
@@ -264,10 +264,10 @@ chip soc/amd/picasso
end
device ref gpp_bridge_2 on end # SD
device ref internal_bridge_a on
- device pci 0.0 on end # Internal GPU
- device pci 0.1 on end # Display HDA
- device pci 0.2 on end # Crypto Coprocessor
- device pci 0.3 on # USB 3.1
+ device ref gfx on end # Internal GPU
+ device ref gfx_hda on end # Display HDA
+ device ref crypto on end # Crypto Coprocessor
+ device ref xhci_0 on # USB 3.1
chip drivers/usb/acpi
register "desc" = ""Root Hub""
register "type" = "UPC_TYPE_HUB"
@@ -334,7 +334,7 @@ chip soc/amd/picasso
end
end
end
- device pci 0.5 on
+ device ref acp on
chip drivers/amd/i2s_machine_dev
register "hid" = ""AMDI5682""
# DMIC select GPIO for ACP machine device
@@ -350,8 +350,8 @@ chip soc/amd/picasso
device generic 0.0 on end
end
end # Audio
- device pci 0.6 off end # HDA
- device pci 0.7 on end # non-Sensor Fusion Hub device
+ device ref hda off end # HDA
+ device ref mp2 on end # non-Sensor Fusion Hub device
end
device ref lpc_bridge on
chip ec/google/chromeec
diff --git a/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb b/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb
index 1ddc7632c7..364458b2e4 100644
--- a/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb
+++ b/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb
@@ -258,10 +258,10 @@ chip soc/amd/picasso
device ref gpp_bridge_2 on end # SD
device ref gpp_bridge_6 on end # NVME
device ref internal_bridge_a on
- device pci 0.0 on end # Internal GPU
- device pci 0.1 on end # Display HDA
- device pci 0.2 on end # Crypto Coprocessor
- device pci 0.3 on # USB 3.1
+ device ref gfx on end # Internal GPU
+ device ref gfx_hda on end # Display HDA
+ device ref crypto on end # Crypto Coprocessor
+ device ref xhci_0 on # USB 3.1
chip drivers/usb/acpi
register "desc" = ""Root Hub""
register "type" = "UPC_TYPE_HUB"
@@ -330,7 +330,7 @@ chip soc/amd/picasso
end
end
end
- device pci 0.4 on # USB 3.1
+ device ref xhci_1 on # USB 3.1
chip drivers/usb/acpi
# The following devices are only enabled on Picasso SKUs
register "desc" = ""Root Hub""
@@ -355,7 +355,7 @@ chip soc/amd/picasso
end
end
end
- device pci 0.5 on
+ device ref acp on
chip drivers/amd/i2s_machine_dev
register "hid" = ""AMDI5682""
# DMIC select GPIO for ACP machine device
@@ -371,8 +371,8 @@ chip soc/amd/picasso
device generic 0.0 on end
end
end # Audio
- device pci 0.6 off end # HDA
- device pci 0.7 on end # non-Sensor Fusion Hub device
+ device ref hda off end # HDA
+ device ref mp2 on end # non-Sensor Fusion Hub device
end
device ref lpc_bridge on
chip ec/google/chromeec
diff --git a/src/mainboard/google/zork/variants/vilboz/overridetree.cb b/src/mainboard/google/zork/variants/vilboz/overridetree.cb
index 7cadaf87c7..5469b32c67 100644
--- a/src/mainboard/google/zork/variants/vilboz/overridetree.cb
+++ b/src/mainboard/google/zork/variants/vilboz/overridetree.cb
@@ -159,7 +159,7 @@ chip soc/amd/picasso
end
end # SD
device ref internal_bridge_a on
- device pci 0.5 on
+ device ref acp on
chip drivers/amd/i2s_machine_dev
register "hid" = ""AMDI1015""
# DMIC select GPIO for ACP machine device