mb/google/kahlee/*/devicetree: use device aliases

Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: I63b1053d36b284ed95b015c0b4b26bdf8e162e67
Reviewed-on: https://review.coreboot.org/c/coreboot/+/68381
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

6 files changed, 120 insertions, 192 deletions

diff --git a/src/mainboard/google/kahlee/variants/aleena/devicetree.cb b/src/mainboard/google/kahlee/variants/aleena/devicetree.cb
index 2bf00ba0f228..b294177460ca 100644
--- a/src/mainboard/google/kahlee/variants/aleena/devicetree.cb
+++ b/src/mainboard/google/kahlee/variants/aleena/devicetree.cb
@@ -45,43 +45,31 @@ chip soc/amd/stoneyridge
 				    GPIO_I2C2_SCL | GPIO_I2C3_SCL"
 
 	device domain 0 on
-		device pci 0.0 on  end # Root Complex
-		device pci 0.2 off end # IOMMU (Disabled for performance and battery)
-		device pci 1.0 on  end # Internal Graphics P2P bridge 0x98e4
-		device pci 1.1 on  end # Internal Multimedia
-		device pci 2.0 on  end # PCIe Host Bridge
-		device pci 2.1 on  end #
-		device pci 2.2 on  end #
-		device pci 2.3 on  end #
-		device pci 2.4 on
+		device ref iommu off end # IOMMU (Disabled for performance and battery)
+		device ref gfx on end
+		device ref gfx_hda on end
+		device ref gpp_bridge_0 on end
+		device ref gpp_bridge_1 on end
+		device ref gpp_bridge_2 on end
+		device ref gpp_bridge_3 on
 			chip drivers/generic/bayhub
 				register "power_saving" = "1"
 				device pci 00.0 on end
 			end
-		end #
-		device pci 2.5 on  end #
-		device pci 8.0 on  end # PSP
-		device pci 9.0 on  end # PCIe Host Bridge
-		device pci 9.2 on  end # HDA
-		device pci 10.0 on  end # xHCI
-		device pci 11.0 off  end # SATA
-		device pci 12.0 on  end # EHCI
-		device pci 14.0 on      # SMbus
-		end # SMbus
-		device pci 14.3 on
+		end
+		device ref gpp_bridge_4 on end
+		device ref hda_bridge on end
+		device ref hda on end
+		device ref xhci on end
+		device ref ehci on end
+		device ref lpc_bridge on
 			chip ec/google/chromeec
 				device pnp 0c09.0 on end
 			end
-		end # LPC
-		device pci 14.7 on  end # SD
-		device pci 18.0 on  end
-		device pci 18.1 on  end
-		device pci 18.2 on  end
-		device pci 18.3 on  end
-		device pci 18.4 on  end
-		device pci 18.5 on  end
+		end
+		device ref sdhci on end
 	end #domain
-	device mmio 0xfedc2000 on
+	device ref i2c_0 on
 		chip drivers/generic/adau7002
 			device generic 0.0 on end
 		end
@@ -110,7 +98,7 @@ chip soc/amd/stoneyridge
 			device generic 0.1 on end
 		end
 	end
-	device mmio 0xfedc3000 on
+	device ref i2c_1 on
 		chip drivers/i2c/tpm
 			register "hid" = ""GOOG0005""
 			register "desc" = ""Cr50 TPM""
@@ -118,7 +106,7 @@ chip soc/amd/stoneyridge
 			device i2c 50 on end
 		end
 	end
-	device mmio 0xfedc4000 on
+	device ref i2c_2 on
 		chip drivers/i2c/generic
 			register "hid" = ""ELAN0000""
 			register "desc" = ""ELAN Touchpad""
@@ -137,7 +125,7 @@ chip soc/amd/stoneyridge
 			device i2c 2c on end
 		end
 	end
-	device mmio 0xfedc5000 on
+	device ref i2c_3 on
 		chip drivers/i2c/generic
 			register "hid" = ""RAYD0001""
 			register "desc" = ""Raydium Touchscreen""
diff --git a/src/mainboard/google/kahlee/variants/careena/devicetree.cb b/src/mainboard/google/kahlee/variants/careena/devicetree.cb
index c68fcf5c57f9..94c568b7f644 100644
--- a/src/mainboard/google/kahlee/variants/careena/devicetree.cb
+++ b/src/mainboard/google/kahlee/variants/careena/devicetree.cb
@@ -45,43 +45,31 @@ chip soc/amd/stoneyridge
 				    GPIO_I2C2_SCL | GPIO_I2C3_SCL"
 
 	device domain 0 on
-		device pci 0.0 on  end # Root Complex
-		device pci 0.2 off end # IOMMU (Disabled for performance and battery)
-		device pci 1.0 on  end # Internal Graphics P2P bridge 0x98e4
-		device pci 1.1 on  end # Internal Multimedia
-		device pci 2.0 on  end # PCIe Host Bridge
-		device pci 2.1 on  end #
-		device pci 2.2 on  end #
-		device pci 2.3 on  end #
-		device pci 2.4 on
+		device ref iommu off end # IOMMU (Disabled for performance and battery)
+		device ref gfx on end
+		device ref gfx_hda on end
+		device ref gpp_bridge_0 on end
+		device ref gpp_bridge_1 on end
+		device ref gpp_bridge_2 on end
+		device ref gpp_bridge_3 on
 			chip drivers/generic/bayhub
 				register "power_saving" = "1"
 				device pci 00.0 on end
 			end
-		end #
-		device pci 2.5 on  end #
-		device pci 8.0 on  end # PSP
-		device pci 9.0 on  end # PCIe Host Bridge
-		device pci 9.2 on  end # HDA
-		device pci 10.0 on  end # xHCI
-		device pci 11.0 off  end # SATA
-		device pci 12.0 on  end # EHCI
-		device pci 14.0 on      # SMbus
-		end # SMbus
-		device pci 14.3 on
+		end
+		device ref gpp_bridge_4 on end
+		device ref hda_bridge on end
+		device ref hda on end
+		device ref xhci on end
+		device ref ehci on end
+		device ref lpc_bridge on
 			chip ec/google/chromeec
 				device pnp 0c09.0 on end
 			end
-		end # LPC
-		device pci 14.7 on  end # SD
-		device pci 18.0 on  end
-		device pci 18.1 on  end
-		device pci 18.2 on  end
-		device pci 18.3 on  end
-		device pci 18.4 on  end
-		device pci 18.5 on  end
+		end
+		device ref sdhci on end
 	end #domain
-	device mmio 0xfedc2000 on
+	device ref i2c_0 on
 		chip drivers/generic/adau7002
 			register "wakeup_delay" = "20"
 			device generic 0.0 on end
@@ -126,7 +114,7 @@ chip soc/amd/stoneyridge
 			device generic 0.1 on end
 		end
 	end
-	device mmio 0xfedc3000 on
+	device ref i2c_1 on
 		chip drivers/i2c/tpm
 			register "hid" = ""GOOG0005""
 			register "desc" = ""Cr50 TPM""
@@ -134,7 +122,7 @@ chip soc/amd/stoneyridge
 			device i2c 50 on end
 		end
 	end
-	device mmio 0xfedc4000 on
+	device ref i2c_2 on
 		chip drivers/i2c/generic
 			register "hid" = ""ELAN0000""
 			register "desc" = ""ELAN Touchpad""
@@ -143,7 +131,7 @@ chip soc/amd/stoneyridge
 			device i2c 15 on end
 		end
 	end
-	device mmio 0xfedc5000 on
+	device ref i2c_3 on
 		chip drivers/i2c/generic
 			register "hid" = ""RAYD0001""
 			register "desc" = ""Raydium Touchscreen""
diff --git a/src/mainboard/google/kahlee/variants/grunt/devicetree.cb b/src/mainboard/google/kahlee/variants/grunt/devicetree.cb
index 15e40abe6217..c1403d59ea80 100644
--- a/src/mainboard/google/kahlee/variants/grunt/devicetree.cb
+++ b/src/mainboard/google/kahlee/variants/grunt/devicetree.cb
@@ -45,43 +45,31 @@ chip soc/amd/stoneyridge
 				    GPIO_I2C2_SCL | GPIO_I2C3_SCL"
 
 	device domain 0 on
-		device pci 0.0 on  end # Root Complex
-		device pci 0.2 off end # IOMMU (Disabled for performance and battery)
-		device pci 1.0 on  end # Internal Graphics P2P bridge 0x98e4
-		device pci 1.1 on  end # Internal Multimedia
-		device pci 2.0 on  end # PCIe Host Bridge
-		device pci 2.1 on  end #
-		device pci 2.2 on  end #
-		device pci 2.3 on  end #
-		device pci 2.4 on
+		device ref iommu off end # IOMMU (Disabled for performance and battery)
+		device ref gfx on end
+		device ref gfx_hda on end
+		device ref gpp_bridge_0 on end
+		device ref gpp_bridge_1 on end
+		device ref gpp_bridge_2 on end
+		device ref gpp_bridge_3 on
 			chip drivers/generic/bayhub
 				register "power_saving" = "1"
 				device pci 00.0 on end
 			end
-		end #
-		device pci 2.5 on  end #
-		device pci 8.0 on  end # PSP
-		device pci 9.0 on  end # PCIe Host Bridge
-		device pci 9.2 on  end # HDA
-		device pci 10.0 on  end # xHCI
-		device pci 11.0 off  end # SATA
-		device pci 12.0 on  end # EHCI
-		device pci 14.0 on      # SMbus
-		end # SMbus
-		device pci 14.3 on
+		end
+		device ref gpp_bridge_4 on end
+		device ref hda_bridge on end
+		device ref hda on end
+		device ref xhci on end
+		device ref ehci on end
+		device ref lpc_bridge on
 			chip ec/google/chromeec
 				device pnp 0c09.0 on end
 			end
-		end # LPC
-		device pci 14.7 on  end # SD
-		device pci 18.0 on  end
-		device pci 18.1 on  end
-		device pci 18.2 on  end
-		device pci 18.3 on  end
-		device pci 18.4 on  end
-		device pci 18.5 on  end
+		end
+		device ref sdhci on end
 	end #domain
-	device mmio 0xfedc2000 on
+	device ref i2c_0 on
 		chip drivers/generic/adau7002
 			device generic 0.0 on end
 		end
@@ -110,7 +98,7 @@ chip soc/amd/stoneyridge
 			device generic 0.1 on end
 		end
 	end
-	device mmio 0xfedc3000 on
+	device ref i2c_1 on
 		chip drivers/i2c/tpm
 			register "hid" = ""GOOG0005""
 			register "desc" = ""Cr50 TPM""
@@ -118,7 +106,7 @@ chip soc/amd/stoneyridge
 			device i2c 50 on end
 		end
 	end
-	device mmio 0xfedc4000 on
+	device ref i2c_2 on
 		chip drivers/i2c/generic
 			register "hid" = ""ELAN0000""
 			register "desc" = ""ELAN Touchpad""
@@ -127,7 +115,7 @@ chip soc/amd/stoneyridge
 			device i2c 15 on end
 		end
 	end
-	device mmio 0xfedc5000 on
+	device ref i2c_3 on
 		chip drivers/i2c/generic
 			register "hid" = ""RAYD0001""
 			register "desc" = ""Raydium Touchscreen""
diff --git a/src/mainboard/google/kahlee/variants/liara/devicetree.cb b/src/mainboard/google/kahlee/variants/liara/devicetree.cb
index fe70ed57b378..50402f01eb7a 100644
--- a/src/mainboard/google/kahlee/variants/liara/devicetree.cb
+++ b/src/mainboard/google/kahlee/variants/liara/devicetree.cb
@@ -44,43 +44,31 @@ chip soc/amd/stoneyridge
 				    GPIO_I2C2_SCL | GPIO_I2C3_SCL"
 
 	device domain 0 on
-		device pci 0.0 on  end # Root Complex
-		device pci 0.2 off end # IOMMU (Disabled for performance and battery)
-		device pci 1.0 on  end # Internal Graphics P2P bridge 0x98e4
-		device pci 1.1 on  end # Internal Multimedia
-		device pci 2.0 on  end # PCIe Host Bridge
-		device pci 2.1 on  end #
-		device pci 2.2 on  end #
-		device pci 2.3 on  end #
-		device pci 2.4 on
+		device ref iommu off end # IOMMU (Disabled for performance and battery)
+		device ref gfx on end
+		device ref gfx_hda on end
+		device ref gpp_bridge_0 on end
+		device ref gpp_bridge_1 on end
+		device ref gpp_bridge_2 on end
+		device ref gpp_bridge_3 on
 			chip drivers/generic/bayhub
 				register "power_saving" = "1"
 				device pci 00.0 on end
 			end
-		end #
-		device pci 2.5 on  end #
-		device pci 8.0 on  end # PSP
-		device pci 9.0 on  end # PCIe Host Bridge
-		device pci 9.2 on  end # HDA
-		device pci 10.0 on  end # xHCI
-		device pci 11.0 off  end # SATA
-		device pci 12.0 on  end # EHCI
-		device pci 14.0 on      # SMbus
-		end # SMbus
-		device pci 14.3 on
+		end
+		device ref gpp_bridge_4 on end
+		device ref hda_bridge on end
+		device ref hda on end
+		device ref xhci on end
+		device ref ehci on end
+		device ref lpc_bridge on
 			chip ec/google/chromeec
 				device pnp 0c09.0 on end
 			end
-		end # LPC
-		device pci 14.7 on  end # SD
-		device pci 18.0 on  end
-		device pci 18.1 on  end
-		device pci 18.2 on  end
-		device pci 18.3 on  end
-		device pci 18.4 on  end
-		device pci 18.5 on  end
+		end
+		device ref sdhci on end
 	end #domain
-	device mmio 0xfedc2000 on
+	device ref i2c_0 on
 		chip drivers/generic/adau7002
 			register "wakeup_delay" = "20"
 			device generic 0.0 on end
@@ -110,7 +98,7 @@ chip soc/amd/stoneyridge
 			device generic 0.1 on end
 		end
 	end
-	device mmio 0xfedc3000 on
+	device ref i2c_1 on
 		chip drivers/i2c/tpm
 			register "hid" = ""GOOG0005""
 			register "desc" = ""Cr50 TPM""
@@ -118,7 +106,7 @@ chip soc/amd/stoneyridge
 			device i2c 50 on end
 		end
 	end
-	device mmio 0xfedc4000 on
+	device ref i2c_2 on
 		chip drivers/i2c/generic
 			register "hid" = ""ELAN0000""
 			register "desc" = ""ELAN Touchpad""
@@ -137,7 +125,7 @@ chip soc/amd/stoneyridge
 			device i2c 2c on end
 		end
 	end
-	device mmio 0xfedc5000 on
+	device ref i2c_3 on
 		chip drivers/i2c/generic
 			register "hid" = ""RAYD0001""
 			register "desc" = ""Raydium Touchscreen""
diff --git a/src/mainboard/google/kahlee/variants/nuwani/devicetree.cb b/src/mainboard/google/kahlee/variants/nuwani/devicetree.cb
index ae2379cb1e93..c329aba1679c 100644
--- a/src/mainboard/google/kahlee/variants/nuwani/devicetree.cb
+++ b/src/mainboard/google/kahlee/variants/nuwani/devicetree.cb
@@ -48,44 +48,32 @@ chip soc/amd/stoneyridge
 				    GPIO_I2C2_SCL | GPIO_I2C3_SCL"
 
 	device domain 0 on
-		device pci 0.0 on  end # Root Complex
-		device pci 0.2 off end # IOMMU (Disabled for performance and battery)
-		device pci 1.0 on  end # Internal Graphics P2P bridge 0x98e4
-		device pci 1.1 on  end # Internal Multimedia
-		device pci 2.0 on  end # PCIe Host Bridge
-		device pci 2.1 on  end #
-		device pci 2.2 on  end #
-		device pci 2.3 on  end #
-		device pci 2.4 on
+		device ref iommu off end # IOMMU (Disabled for performance and battery)
+		device ref gfx on end
+		device ref gfx_hda on end
+		device ref gpp_bridge_0 on end
+		device ref gpp_bridge_1 on end
+		device ref gpp_bridge_2 on end
+		device ref gpp_bridge_3 on
 			chip drivers/generic/bayhub
 				register "power_saving" = "1"
 				register "vih_tuning_value" = "0x35"
 				device pci 00.0 on end
 			end
-		end #
-		device pci 2.5 on  end #
-		device pci 8.0 on  end # PSP
-		device pci 9.0 on  end # PCIe Host Bridge
-		device pci 9.2 on  end # HDA
-		device pci 10.0 on  end # xHCI
-		device pci 11.0 off  end # SATA
-		device pci 12.0 on  end # EHCI
-		device pci 14.0 on      # SMbus
-		end # SMbus
-		device pci 14.3 on
+		end
+		device ref gpp_bridge_4 on end
+		device ref hda_bridge on end
+		device ref hda on end
+		device ref xhci on end
+		device ref ehci on end
+		device ref lpc_bridge on
 			chip ec/google/chromeec
 				device pnp 0c09.0 on end
 			end
-		end # LPC
-		device pci 14.7 on  end # SD
-		device pci 18.0 on  end
-		device pci 18.1 on  end
-		device pci 18.2 on  end
-		device pci 18.3 on  end
-		device pci 18.4 on  end
-		device pci 18.5 on  end
+		end
+		device ref sdhci on end
 	end #domain
-	device mmio 0xfedc2000 on
+	device ref i2c_0 on
 		chip drivers/generic/adau7002
 			device generic 0.0 on end
 		end
@@ -114,7 +102,7 @@ chip soc/amd/stoneyridge
 			device generic 0.1 on end
 		end
 	end
-	device mmio 0xfedc3000 on
+	device ref i2c_1 on
 		chip drivers/i2c/tpm
 			register "hid" = ""GOOG0005""
 			register "desc" = ""Cr50 TPM""
@@ -122,7 +110,7 @@ chip soc/amd/stoneyridge
 			device i2c 50 on end
 		end
 	end
-	device mmio 0xfedc4000 on
+	device ref i2c_2 on
 		chip drivers/i2c/generic
 			register "hid" = ""ELAN0000""
 			register "desc" = ""ELAN Touchpad""
@@ -141,7 +129,7 @@ chip soc/amd/stoneyridge
 			device i2c 0x2c on end
 		end
 	end
-	device mmio 0xfedc5000 on
+	device ref i2c_3 on
 		chip drivers/i2c/hid
 			register "generic.hid" = ""ELAN90FC""
 			register "generic.desc" = ""ELAN Touchscreen""
diff --git a/src/mainboard/google/kahlee/variants/treeya/devicetree.cb b/src/mainboard/google/kahlee/variants/treeya/devicetree.cb
index 569831c09ad7..45f8089f9b21 100644
--- a/src/mainboard/google/kahlee/variants/treeya/devicetree.cb
+++ b/src/mainboard/google/kahlee/variants/treeya/devicetree.cb
@@ -48,44 +48,32 @@ chip soc/amd/stoneyridge
 				    GPIO_I2C2_SCL | GPIO_I2C3_SCL"
 
 	device domain 0 on
-		device pci 0.0 on  end # Root Complex
-		device pci 0.2 off end # IOMMU (Disabled for performance and battery)
-		device pci 1.0 on  end # Internal Graphics P2P bridge 0x98e4
-		device pci 1.1 on  end # Internal Multimedia
-		device pci 2.0 on  end # PCIe Host Bridge
-		device pci 2.1 on  end #
-		device pci 2.2 on  end #
-		device pci 2.3 on  end #
-		device pci 2.4 on
+		device ref iommu off end # IOMMU (Disabled for performance and battery)
+		device ref gfx on end
+		device ref gfx_hda on end
+		device ref gpp_bridge_0 on end
+		device ref gpp_bridge_1 on end
+		device ref gpp_bridge_2 on end
+		device ref gpp_bridge_3 on
 			chip drivers/generic/bayhub
 				register "power_saving" = "1"
 				register "vih_tuning_value" = "0x35"
 				device pci 00.0 on end
 			end
-		end #
-		device pci 2.5 on  end #
-		device pci 8.0 on  end # PSP
-		device pci 9.0 on  end # PCIe Host Bridge
-		device pci 9.2 on  end # HDA
-		device pci 10.0 on  end # xHCI
-		device pci 11.0 off  end # SATA
-		device pci 12.0 on  end # EHCI
-		device pci 14.0 on      # SMbus
-		end # SMbus
-		device pci 14.3 on
+		end
+		device ref gpp_bridge_4 on end
+		device ref hda_bridge on end
+		device ref hda on end
+		device ref xhci on end
+		device ref ehci on end
+		device ref lpc_bridge on
 			chip ec/google/chromeec
 				device pnp 0c09.0 on end
 			end
-		end # LPC
-		device pci 14.7 on  end # SD
-		device pci 18.0 on  end
-		device pci 18.1 on  end
-		device pci 18.2 on  end
-		device pci 18.3 on  end
-		device pci 18.4 on  end
-		device pci 18.5 on  end
+		end
+		device ref sdhci on end
 	end #domain
-	device mmio 0xfedc2000 on
+	device ref i2c_0 on
 		chip drivers/generic/adau7002
 			device generic 0.0 on end
 		end
@@ -129,7 +117,7 @@ chip soc/amd/stoneyridge
 			device generic 0.1 on end
 		end
 	end
-	device mmio 0xfedc3000 on
+	device ref i2c_1 on
 		chip drivers/i2c/tpm
 			register "hid" = ""GOOG0005""
 			register "desc" = ""Cr50 TPM""
@@ -137,7 +125,7 @@ chip soc/amd/stoneyridge
 			device i2c 50 on end
 		end
 	end
-	device mmio 0xfedc4000 on
+	device ref i2c_2 on
 		chip drivers/i2c/generic
 			register "hid" = ""ELAN0000""
 			register "desc" = ""ELAN Touchpad""
@@ -156,7 +144,7 @@ chip soc/amd/stoneyridge
 			device i2c 0x2c on end
 		end
 	end
-	device mmio 0xfedc5000 on
+	device ref i2c_3 on
 		chip drivers/i2c/hid
 			register "generic.hid" = ""SYTS7817""
 			register "generic.desc" = ""Synaptics Touchscreen""