diff --git a/src/mainboard/google/volteer/variants/baseboard/devicetree.cb b/src/mainboard/google/volteer/variants/baseboard/devicetree.cb
index 7790230..e428588 100644
--- a/src/mainboard/google/volteer/variants/baseboard/devicetree.cb
+++ b/src/mainboard/google/volteer/variants/baseboard/devicetree.cb
@@ -320,10 +320,8 @@
 	}"
 
 	device domain 0 on
-		#From EDS(575683)
-		device pci 00.0 on  end # Host Bridge			0x9A14:U/0x9A12:Y
-		device pci 02.0 on  end # Graphics
-		device pci 04.0 on
+		device ref igpu on end
+		device ref dptf on
 			# Default DPTF Policy for all Volteer boards if not overridden
 			chip drivers/intel/dptf
 				## Active Policy
@@ -417,90 +415,44 @@
 				device generic 0 on end
 			end
 		end # DPTF				0x9A03
-		device pci 05.0 off end # IPU				0x9A19
-		device pci 06.0 off end # PEG60				0x9A09
-		device pci 07.0 on	# TBT_PCIe0			0x9A23
+		device ref tbt_pcie_rp0 on
 			probe DB_USB USB4_GEN2
 			probe DB_USB USB4_GEN3
 		end
-		device pci 07.1 on	# TBT_PCIe1			0x9A25
+		device ref tbt_pcie_rp1 on
 			probe DB_USB USB4_GEN2
 			probe DB_USB USB4_GEN3
 		end
-		device pci 07.2 off end # TBT_PCIe2			0x9A27
-		device pci 07.3 off end # TBT_PCIe3			0x9A29
-		device pci 08.0 on  end # GNA				0x9A11
-		device pci 09.0 off end # NPK				0x9A33
-		device pci 0a.0 off end # Crash-log SRAM		0x9A0D
-		device pci 0d.0 on  end # USB xHCI			0x9A13
-		device pci 0d.1 off end # USB xDCI (OTG)		0x9A15
-		device pci 0d.2 on	# TBT DMA0			0x9A1B
+		device ref tbt_dma0 on
 			probe DB_USB USB4_GEN2
 			probe DB_USB USB4_GEN3
 		end
-		device pci 0d.3 off end # TBT DMA1			0x9A1D
-		device pci 0e.0 off end # VMD				0x9A0B
-
-		# From PCH EDS(576591)
-		device pci 10.2 on  end # CNVi: BT			0xA0F5 - A0F7
-		device pci 10.6 off end # THC0				0xA0D0
-		device pci 10.7 off end # THC1				0xA0D1
-
-		device pci 12.0 off end # SensorHUB			0xA0FC
-		device pci 12.6 off end # GSPI2				0x34FB
-
-		device pci 13.0 off end # GSPI3				0xA0FD
-
-		device pci 14.0 on  end # USB3.1 xHCI			0xA0ED
-		device pci 14.1 off end # USB3.1 xDCI			0xA0EE
-		device pci 14.2 on  end # Shared RAM			0xA0EF
+		device ref gna on end
+		device ref north_xhci on end
+		device ref cnvi_bt on end
+		device ref south_xhci on end
+		device ref shared_ram on end
 		chip drivers/intel/wifi
 			register "wake" = "GPE0_PME_B0"
-			device pci 14.3 on end # CNVi: WiFi		0xA0F0 - A0F3
+			device ref cnvi_wifi on end
 		end
-		device pci 15.0 on  end # I2C #0			0xA0E8
-		device pci 15.1 on  end # I2C1				0xA0E9
-		device pci 15.2 on  end # I2C2				0xA0EA
-		device pci 15.3 on  end # I2C3				0xA0EB
-
-		device pci 16.0 on  end # HECI1				0xA0E0
-		device pci 16.1 off end # HECI2				0xA0E1
-		device pci 16.2 off end # CSME				0xA0E2
-		device pci 16.3 off end # CSME				0xA0E3
-		device pci 16.4 off end # HECI3				0xA0E4
-		device pci 16.5 off end # HECI4				0xA0E5
-
-		device pci 17.0 on  end # SATA				0xA0D3
-
-		device pci 19.0 on  end # I2C4				0xA0C5
-		device pci 19.1 on  end # I2C5				0xA0C6
-		device pci 19.2 off end # UART2				0xA0C7
-
-		device pci 1c.0 on  end # RP1				0xA0B8
-		device pci 1c.1 off end # RP2				0xA0B9
-		device pci 1c.2 off end # RP3				0xA0BA
-		device pci 1c.3 off end # RP4				0xA0BB
-		device pci 1c.4 off end # RP5				0xA0BC
-		device pci 1c.5 off end # WWAN RP6			0xA0BD
-		device pci 1c.6 on  end # RP7				0xA0BE
-		device pci 1c.7 on  end # SD Card RP8			0xA0BF
-
-		device pci 1d.0 on  end # RP9				0xA0B0
-		device pci 1d.1 off end # RP10				0xA0B1
-		device pci 1d.2 on  end # RP11				0xA0B2
-		device pci 1d.3 off end # RP12				0xA0B3
-
-		device pci 1e.0 on  end # UART0				0xA0A8
-		device pci 1e.1 off end # UART1				0xA0A9
-		device pci 1e.2 on
+		device ref heci1 on end
+		device ref sata on end
+		device ref pcie_rp1 on end
+		device ref pcie_rp7 on end
+		device ref pcie_rp8 on end
+		device ref pcie_rp9 on end
+		device ref pcie_rp11 on end
+		device ref uart0 on end
+		device ref gspi0 on
 			chip drivers/spi/acpi
 				register "hid" = "ACPI_DT_NAMESPACE_HID"
 				register "compat_string" = ""google,cr50""
 				register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_C21_IRQ)"
 				device spi 0 on end
 			end
-		end # GSPI0						0xA0AA
-		device pci 1e.3 on
+		end
+		device ref gspi1 on
 			chip drivers/spi/acpi
 				register "name" = ""CRFP""
 				register "hid" = "ACPI_DT_NAMESPACE_HID"
@@ -509,18 +461,12 @@
 				register "irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW_WAKE(GPP_C20)"
 				device spi 0 on end
 			end # FPMCU
-		end # GSPI1						0xA0AB
-		device pci 1f.0 on
+		end
+		device ref pch_espi on
 			chip ec/google/chromeec
 				device pnp 0c09.0 on end
 			end
-		end # eSPI						0xA080 - A09F
-		device pci 1f.1 off end # P2SB				0xA0A0
-		device pci 1f.2 hidden end # PMC			0xA0A1
-		device pci 1f.3 on  end # Intel HD audio		0xA0C8-A0CF
-		device pci 1f.4 off end # SMBus				0xA0A3
-		device pci 1f.5 on  end # SPI				0xA0A4
-		device pci 1f.6 off end # GbE				0x15E1/0x15E2
-		device pci 1f.7 off end # TH				0xA0A6
+		end
+		device ref hda on end
 	end
 end
diff --git a/src/mainboard/google/volteer/variants/delbin/overridetree.cb b/src/mainboard/google/volteer/variants/delbin/overridetree.cb
index 05c8a34..21b1f07 100644
--- a/src/mainboard/google/volteer/variants/delbin/overridetree.cb
+++ b/src/mainboard/google/volteer/variants/delbin/overridetree.cb
@@ -3,7 +3,7 @@
 	register "DdiPort2Hpd" = "0"
 
 	device domain 0 on
-		device pci 15.0 on
+		device ref i2c0 on
 			chip drivers/i2c/generic
 				register "hid" = ""10EC5682""
 				register "name" = ""RT58""
@@ -33,7 +33,7 @@
 				device i2c 32 on end
 			end
 		end
-		device pci 15.1 on
+		device ref i2c1 on
 			chip drivers/i2c/hid
 				register "generic.hid" = ""ELAN9008""
 				register "generic.desc" = ""ELAN Touchscreen""
@@ -48,8 +48,8 @@
 				register "hid_desc_reg_offset" = "0x01"
 				device i2c 10 on end
 			end
-		end # I2C1				0xA0E9
-		device pci 19.1 on
+		end
+		device ref i2c5 on
 			chip drivers/i2c/generic
 				register "hid" = ""ELAN0000""
 				register "desc" = ""ELAN Touchpad""
@@ -58,8 +58,8 @@
 				register "probed" = "1"
 				device i2c 15 on end
 			end
-		end # I2C5				0xA0C6
-		device pci 1f.2 hidden
+		end
+		device ref pmc hidden
 			# The pmc_mux chip driver is a placeholder for the
 			# PMC.MUX device in the ACPI hierarchy.
 			chip drivers/intel/pmc_mux
@@ -80,6 +80,6 @@
 					end
 				end
 			end
-		end # PMC
+		end
 	end
 end
diff --git a/src/mainboard/google/volteer/variants/eldrid/overridetree.cb b/src/mainboard/google/volteer/variants/eldrid/overridetree.cb
index 6e9d743..5fcd456 100644
--- a/src/mainboard/google/volteer/variants/eldrid/overridetree.cb
+++ b/src/mainboard/google/volteer/variants/eldrid/overridetree.cb
@@ -58,8 +58,8 @@
 	}"
 
 	device domain 0 on
-		device pci 04.0 off end
-		device pci 15.0 on
+		device ref dptf off end
+		device ref i2c0 on
 			chip drivers/i2c/generic
 				register "hid" = ""10EC5682""
 				register "name" = ""RT58""
@@ -73,7 +73,7 @@
 				device i2c 1a on end
 			end
 		end
-		device pci 15.1 on
+		device ref i2c1 on
 			chip drivers/i2c/hid
 				register "generic.hid" = ""GDIX0000""
 				register "generic.desc" = ""Goodix Touchscreen""
@@ -105,8 +105,8 @@
 				register "hid_desc_reg_offset" = "0x01"
 				device i2c 10 on end
 			end
-		end # I2C1				0xA0E9
-		device pci 19.1 on
+		end
+		device ref i2c5 on
 			chip drivers/i2c/generic
 				register "hid" = ""ELAN0000""
 				register "desc" = ""ELAN Touchpad""
@@ -115,8 +115,8 @@
 				register "probed" = "1"
 				device i2c 15 on end
 			end
-		end # I2C5				0xA0C6
-		device pci 1f.3 on
+		end
+		device ref hda on
 			chip drivers/generic/max98357a
 				register "hid" = ""MX98357A""
 				register "sdmode_gpio" =  "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_A10)"
@@ -124,7 +124,7 @@
 				device generic 0 on end
 			end
 		end
-		device pci 1f.2 hidden
+		device ref pmc hidden
 			# The pmc_mux chip driver is a placeholder for the
 			# PMC.MUX device in the ACPI hierarchy.
 			chip drivers/intel/pmc_mux
diff --git a/src/mainboard/google/volteer/variants/halvor/overridetree.cb b/src/mainboard/google/volteer/variants/halvor/overridetree.cb
index 73767c6..f8b2921 100644
--- a/src/mainboard/google/volteer/variants/halvor/overridetree.cb
+++ b/src/mainboard/google/volteer/variants/halvor/overridetree.cb
@@ -8,9 +8,10 @@
 	register "SaGv" = "SaGv_Disabled"
 
 	device domain 0 on
-		device pci 07.2 on end # TBT_PCIe2
-		device pci 0d.3 on end # TBT DMA1			0x9A1D
-		device pci 15.0 on
+		# Baseboard does not have these on, so they must be enabled here.
+		device ref tbt_pcie_rp2 on end # TBT_PCIe2
+		device ref tbt_dma1 on end # TBT DMA1			0x9A1D
+		device ref i2c0 on
 			chip drivers/i2c/generic
 				register "hid" = ""10EC5682""
 				register "name" = ""RT58""
@@ -43,8 +44,8 @@
 					probe AUDIO MAX98373_ALC5682I_I2S_UP4
 				end
 			end
-		end # I2C #0			0xA0E8
-		device pci 15.1 on
+		end
+		device ref i2c1 on
 			chip drivers/i2c/hid
 				register "generic.hid" = ""GDIX0000""
 				register "generic.desc" = ""Goodix Touchscreen""
@@ -74,8 +75,8 @@
 				register "hid_desc_reg_offset" = "0x01"
 				device i2c 10 on end
 			end
-		end # I2C1				0xA0E9
-		device pci 15.2 on
+		end
+		device ref i2c2 on
 			chip drivers/i2c/sx9310
 				register "desc" = ""SAR0 Proximity Sensor""
 				register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_F14_IRQ)"
@@ -106,8 +107,8 @@
 				register "reg_sar_ctrl2" = "0x3c"
 				device i2c 28 on end
 			end
-		end # I2C2				0xA0EA
-		device pci 19.1 on
+		end
+		device ref i2c5 on
 			chip drivers/i2c/generic
 				register "hid" = ""ELAN0000""
 				register "desc" = ""ELAN Touchpad""
@@ -116,7 +117,7 @@
 				register "probed" = "1"
 				device i2c 15 on end
 			end
-		end # I2C5				0xA0C6
-		device pci 1f.3 on end # Intel HD audio		0xA0C8-A0CF
+		end
+		device ref hda on end
 	end
 end
diff --git a/src/mainboard/google/volteer/variants/lindar/overridetree.cb b/src/mainboard/google/volteer/variants/lindar/overridetree.cb
index e16012d..5f0f290 100644
--- a/src/mainboard/google/volteer/variants/lindar/overridetree.cb
+++ b/src/mainboard/google/volteer/variants/lindar/overridetree.cb
@@ -19,11 +19,12 @@
 		[PchSerialIoIndexI2C5]  = PchSerialIoPci,
 	}"
 	device domain 0 on
-		device pci 07.0 off end # TBT_PCIe0			0x9A23
-		device pci 07.1 off end # TBT_PCIe1			0x9A25
-		device pci 07.2 off end # TBT_PCIe2			0x9A27
-		device pci 07.3 off end # TBT_PCIe3			0x9A29
-		device pci 15.0 on
+		# Baseboard has these on, so they must be disabled here.
+		device ref tbt_pcie_rp0 off end
+		device ref tbt_pcie_rp1 off end
+		device ref tbt_dma0 off end
+
+		device ref i2c0 on
 			chip drivers/i2c/generic
 				register "hid" = ""10EC5682""
 				register "name" = ""RT58""
@@ -36,8 +37,8 @@
 				register "property_list[0].integer" = "1"
 				device i2c 1a on end
 			end
-		end # I2C0
-		device pci 15.1 on
+		end
+		device ref i2c1 on
 			chip drivers/i2c/hid
 				register "generic.hid" = ""GDIX0000""
 				register "generic.desc" = ""Goodix Touchscreen""
@@ -59,9 +60,8 @@
 				register "hid_desc_reg_offset" = "0x01"
 				device i2c 14 on end
 			end
-		end # I2C1
-		device pci 15.2 off end # I2C2				0xA0EA
-		device pci 19.1 on
+		end
+		device ref i2c5 on
 			chip drivers/i2c/generic
 				register "hid" = ""ELAN0000""
 				register "desc" = ""ELAN Touchpad""
@@ -70,6 +70,6 @@
 				register "probed" = "1"
 				device i2c 15 on end
 			end
-		end # I2C5				0xA0C6
+		end
 	end
 end
diff --git a/src/mainboard/google/volteer/variants/malefor/overridetree.cb b/src/mainboard/google/volteer/variants/malefor/overridetree.cb
index 1dc6c2b..64b15b3 100644
--- a/src/mainboard/google/volteer/variants/malefor/overridetree.cb
+++ b/src/mainboard/google/volteer/variants/malefor/overridetree.cb
@@ -26,11 +26,12 @@
 	}"
 
 	device domain 0 on
-		device pci 07.0 off end # TBT_PCIe0			0x9A23
-		device pci 07.1 off end # TBT_PCIe1			0x9A25
-		device pci 07.2 off end # TBT_PCIe2			0x9A27
-		device pci 07.3 off end # TBT_PCIe3			0x9A29
-		device pci 15.0 on
+		# Baseboard has these on, so they must be disabled here.
+		device ref tbt_pcie_rp0 off end
+		device ref tbt_pcie_rp1 off end
+		device ref tbt_dma0 off end
+
+		device ref i2c0 on
 			chip drivers/i2c/generic
 				register "hid" = ""10EC5682""
 				register "name" = ""RT58""
@@ -43,8 +44,8 @@
 				register "property_list[0].integer" = "1"
 				device i2c 1a on end
 			end
-		end # I2C0
-		device pci 15.1 on
+		end
+		device ref i2c1 on
 			chip drivers/i2c/hid
 				register "generic.hid" = ""GDIX0000""
 				register "generic.desc" = ""Goodix Touchscreen""
@@ -61,8 +62,8 @@
 				register "hid_desc_reg_offset" = "0x01"
 				device i2c 5d on end
 			end
-		end # I2C1
-		device pci 15.2 on
+		end
+		device ref i2c3 on
 			chip drivers/i2c/sx9310
 				register "desc" = ""SAR0 Proximity Sensor""
 				register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_F14_IRQ)"
@@ -93,8 +94,8 @@
 				register "reg_sar_ctrl2" = "0x3c"
 				device i2c 28 on end
 			end
-		end # I2C2				0xA0EA
-		device pci 19.1 on
+		end
+		device ref i2c5 on
 			chip drivers/i2c/generic
 				register "hid" = ""ELAN0000""
 				register "desc" = ""ELAN Touchpad""
@@ -103,14 +104,14 @@
 				register "probed" = "1"
 				device i2c 15 on end
 			end
-		end # I2C5				0xA0C6
-		device pci 1f.3 on
+		end
+		device ref hda on
 			chip drivers/generic/max98357a
 				register "hid" = ""MX98357A""
 				register "sdmode_gpio" =  "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_A10)"
 				register "sdmode_delay" = "5"
 				device generic 0 on end
 			end
-		end # Intel HD audio
+		end
 	end
 end
diff --git a/src/mainboard/google/volteer/variants/terrador/overridetree.cb b/src/mainboard/google/volteer/variants/terrador/overridetree.cb
index 95f1f8a..1ccdb87 100644
--- a/src/mainboard/google/volteer/variants/terrador/overridetree.cb
+++ b/src/mainboard/google/volteer/variants/terrador/overridetree.cb
@@ -17,7 +17,7 @@
 	register "SaGv" = "SaGv_Disabled"
 
 	device domain 0 on
-		device pci 15.0 on
+		device ref i2c0 on
 			chip drivers/i2c/generic
 				register "hid" = ""10EC5682""
 				register "name" = ""RT58""
@@ -51,8 +51,8 @@
 					probe AUDIO MAX98373_ALC5682I_I2S_UP4
 				end
 			end
-		end # I2C #0			0xA0E8
-		device pci 15.1 on
+		end
+		device ref i2c1 on
 			chip drivers/i2c/hid
 				register "generic.hid" = ""GDIX0000""
 				register "generic.desc" = ""Goodix Touchscreen""
@@ -82,8 +82,8 @@
 				register "hid_desc_reg_offset" = "0x01"
 				device i2c 10 on end
 			end
-		end # I2C1				0xA0E9
-		device pci 15.2 on
+		end
+		device ref i2c2 on
 			chip drivers/i2c/sx9310
 				register "desc" = ""SAR0 Proximity Sensor""
 				register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_F14_IRQ)"
@@ -114,8 +114,8 @@
 				register "reg_sar_ctrl2" = "0x3c"
 				device i2c 28 on end
 			end
-		end # I2C2				0xA0EA
-		device pci 19.1 on
+		end
+		device ref i2c5 on
 			chip drivers/i2c/hid
 				register "generic.hid" = ""ELAN2700""
 				register "generic.desc" = ""ELAN Touchpad""
@@ -125,8 +125,8 @@
 				register "hid_desc_reg_offset" = "0x01"
 				device i2c 15 on end
 			end
-		end # I2C5				0xA0C6
-		device pci 1f.2 hidden
+		end
+		device ref pmc hidden
 			# The pmc_mux chip driver is a placeholder for the
 			# PMC.MUX device in the ACPI hierarchy.
 			chip drivers/intel/pmc_mux
@@ -147,6 +147,6 @@
 					end
 				end
 			end
-		end # PMC
+		end
 	end
 end
diff --git a/src/mainboard/google/volteer/variants/todor/overridetree.cb b/src/mainboard/google/volteer/variants/todor/overridetree.cb
index 95f1f8a..1ccdb87 100644
--- a/src/mainboard/google/volteer/variants/todor/overridetree.cb
+++ b/src/mainboard/google/volteer/variants/todor/overridetree.cb
@@ -17,7 +17,7 @@
 	register "SaGv" = "SaGv_Disabled"
 
 	device domain 0 on
-		device pci 15.0 on
+		device ref i2c0 on
 			chip drivers/i2c/generic
 				register "hid" = ""10EC5682""
 				register "name" = ""RT58""
@@ -51,8 +51,8 @@
 					probe AUDIO MAX98373_ALC5682I_I2S_UP4
 				end
 			end
-		end # I2C #0			0xA0E8
-		device pci 15.1 on
+		end
+		device ref i2c1 on
 			chip drivers/i2c/hid
 				register "generic.hid" = ""GDIX0000""
 				register "generic.desc" = ""Goodix Touchscreen""
@@ -82,8 +82,8 @@
 				register "hid_desc_reg_offset" = "0x01"
 				device i2c 10 on end
 			end
-		end # I2C1				0xA0E9
-		device pci 15.2 on
+		end
+		device ref i2c2 on
 			chip drivers/i2c/sx9310
 				register "desc" = ""SAR0 Proximity Sensor""
 				register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_F14_IRQ)"
@@ -114,8 +114,8 @@
 				register "reg_sar_ctrl2" = "0x3c"
 				device i2c 28 on end
 			end
-		end # I2C2				0xA0EA
-		device pci 19.1 on
+		end
+		device ref i2c5 on
 			chip drivers/i2c/hid
 				register "generic.hid" = ""ELAN2700""
 				register "generic.desc" = ""ELAN Touchpad""
@@ -125,8 +125,8 @@
 				register "hid_desc_reg_offset" = "0x01"
 				device i2c 15 on end
 			end
-		end # I2C5				0xA0C6
-		device pci 1f.2 hidden
+		end
+		device ref pmc hidden
 			# The pmc_mux chip driver is a placeholder for the
 			# PMC.MUX device in the ACPI hierarchy.
 			chip drivers/intel/pmc_mux
@@ -147,6 +147,6 @@
 					end
 				end
 			end
-		end # PMC
+		end
 	end
 end
diff --git a/src/mainboard/google/volteer/variants/trondo/overridetree.cb b/src/mainboard/google/volteer/variants/trondo/overridetree.cb
index d7c0b7a..d18bb10 100644
--- a/src/mainboard/google/volteer/variants/trondo/overridetree.cb
+++ b/src/mainboard/google/volteer/variants/trondo/overridetree.cb
@@ -2,7 +2,7 @@
 	register "SaGv" = "SaGv_Disabled"
 
 	device domain 0 on
-		device pci 15.1 on
+		device ref i2c1 on
 			chip drivers/i2c/hid
 				register "generic.hid" = ""GDIX0000""
 				register "generic.desc" = ""Goodix Touchscreen""
@@ -32,8 +32,8 @@
 				register "hid_desc_reg_offset" = "0x01"
 				device i2c 10 on end
 			end
-		end # I2C1				0xA0E9
-		device pci 15.2 on
+		end
+		device ref i2c2 on
 			chip drivers/i2c/sx9310
 				register "desc" = ""SAR0 Proximity Sensor""
 				register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_F14_IRQ)"
@@ -64,8 +64,8 @@
 				register "reg_sar_ctrl2" = "0x3c"
 				device i2c 28 on end
 			end
-		end # I2C2				0xA0EA
-		device pci 19.1 on
+		end
+		device ref i2c5 on
 			chip drivers/i2c/generic
 				register "hid" = ""ELAN0000""
 				register "desc" = ""ELAN Touchpad""
@@ -74,6 +74,6 @@
 				register "probed" = "1"
 				device i2c 15 on end
 			end
-		end # I2C5				0xA0C6
+		end
 	end
 end
diff --git a/src/mainboard/google/volteer/variants/volteer/overridetree.cb b/src/mainboard/google/volteer/variants/volteer/overridetree.cb
index 2ef9fc9..5079493 100644
--- a/src/mainboard/google/volteer/variants/volteer/overridetree.cb
+++ b/src/mainboard/google/volteer/variants/volteer/overridetree.cb
@@ -48,8 +48,8 @@
 	register "IomTypeCPortPadCfg[1]" = "0x090E000D"
 
 	device domain 0 on
-		device pci 05.0 on end # IPU                           0x9A19
-		device pci 15.0 on
+		device ref ipu on end
+		device ref i2c0 on
 			chip drivers/i2c/generic
 				register "hid" = ""10EC5682""
 				register "name" = ""RT58""
@@ -86,7 +86,7 @@
 				end
 			end
 		end
-		device pci 15.1 on
+		device ref i2c1 on
 			chip drivers/i2c/hid
 				register "generic.hid" = ""GDIX0000""
 				register "generic.desc" = ""Goodix Touchscreen""
@@ -135,8 +135,8 @@
 				register "key.label" = ""pen_eject""
 				device generic 0 on end
 			end
-		end # I2C1				0xA0E9
-		device pci 15.2 on
+		end
+		device ref i2c2 on
 			chip drivers/i2c/sx9310
 				register "desc" = ""SAR0 Proximity Sensor""
 				register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_F14_IRQ)"
@@ -167,8 +167,8 @@
 				register "reg_sar_ctrl2" = "0x3c"
 				device i2c 28 on end
 			end
-		end # I2C2				0xA0EA
-		device pci 19.1 on
+		end
+		device ref i2c5 on
 			chip drivers/i2c/generic
 				register "hid" = ""ELAN0000""
 				register "desc" = ""ELAN Touchpad""
@@ -177,8 +177,8 @@
 				register "probed" = "1"
 				device i2c 15 on end
 			end
-		end # I2C5				0xA0C6
-		device pci 1f.3 on
+		end
+		device ref hda on
 			chip drivers/generic/max98357a
 				register "hid" = ""MX98357A""
 				register "sdmode_gpio" =  "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_A10)"
@@ -208,7 +208,7 @@
 				end
 			end
 		end
-		device pci 1f.2 hidden
+		device ref pmc hidden
 			# The pmc_mux chip driver is a placeholder for the
 			# PMC.MUX device in the ACPI hierarchy.
 			chip drivers/intel/pmc_mux
@@ -241,6 +241,6 @@
 					end
 				end
 			end
-		end # PMC
+		end
 	end
 end
diff --git a/src/mainboard/google/volteer/variants/volteer2/overridetree.cb b/src/mainboard/google/volteer/variants/volteer2/overridetree.cb
index 2f5d26d..f8dcd58 100644
--- a/src/mainboard/google/volteer/variants/volteer2/overridetree.cb
+++ b/src/mainboard/google/volteer/variants/volteer2/overridetree.cb
@@ -6,7 +6,7 @@
 	register "DdiPort2Hpd" = "0"
 
 	device domain 0 on
-		device pci 04.0 on
+		device ref dptf on
 			chip drivers/intel/dptf
 				## Active Policy
 				register "policies.active" = "{
@@ -43,8 +43,8 @@
 				device generic 0 on end
 			end
 		end # DPTF				0x9A03
-		device pci 05.0 on end # IPU                           0x9A19
-		device pci 15.0 on
+		device ref ipu on end # IPU                           0x9A19
+		device ref i2c0 on
 			chip drivers/i2c/generic
 				register "hid" = ""10EC5682""
 				register "name" = ""RT58""
@@ -81,7 +81,7 @@
 				end
 			end
 		end
-		device pci 15.1 on
+		device ref i2c1 on
 			chip drivers/i2c/hid
 				register "generic.hid" = ""GDIX0000""
 				register "generic.desc" = ""Goodix Touchscreen""
@@ -130,8 +130,8 @@
 				register "key.label" = ""pen_eject""
 				device generic 0 on end
 			end
-		end # I2C1				0xA0E9
-		device pci 15.2 on
+		end
+		device ref i2c2 on
 			chip drivers/i2c/sx9310
 				register "desc" = ""SAR0 Proximity Sensor""
 				register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_F14_IRQ)"
@@ -162,8 +162,8 @@
 				register "reg_sar_ctrl2" = "0x3c"
 				device i2c 28 on end
 			end
-		end # I2C2				0xA0EA
-		device pci 19.1 on
+		end
+		device ref i2c5 on
 			chip drivers/i2c/generic
 				register "hid" = ""ELAN0000""
 				register "desc" = ""ELAN Touchpad""
@@ -172,8 +172,8 @@
 				register "probed" = "1"
 				device i2c 15 on end
 			end
-		end # I2C5				0xA0C6
-		device pci 1f.3 on
+		end
+		device ref hda on
 			chip drivers/generic/max98357a
 				register "hid" = ""MX98357A""
 				register "sdmode_gpio" =  "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_A10)"
@@ -203,7 +203,7 @@
 				end
 			end
 		end
-		device pci 1f.2 hidden
+		device ref pmc hidden
 			# The pmc_mux chip driver is a placeholder for the
 			# PMC.MUX device in the ACPI hierarchy.
 			chip drivers/intel/pmc_mux
@@ -236,6 +236,6 @@
 					end
 				end
 			end
-		end # PMC
+		end
 	end
 end
diff --git a/src/mainboard/google/volteer/variants/voxel/overridetree.cb b/src/mainboard/google/volteer/variants/voxel/overridetree.cb
index 330d852..8ce6875 100644
--- a/src/mainboard/google/volteer/variants/voxel/overridetree.cb
+++ b/src/mainboard/google/volteer/variants/voxel/overridetree.cb
@@ -13,7 +13,7 @@
 	}"
 
 	device domain 0 on
-		device pci 04.0 on
+		device ref dptf on
 			chip drivers/intel/dptf
 				## Active Policy
 				register "policies.active" = "{
@@ -61,8 +61,8 @@
 
 				device generic 0 on end
 			end
-		end # DPTF				0x9A03
-		device pci 15.0 on
+		end
+		device ref i2c0 on
 			chip drivers/i2c/generic
 				register "hid" = ""10EC5682""
 				register "name" = ""RT58""
@@ -94,8 +94,8 @@
 				device i2c 32 on
 				end
 			end
-		end # I2C #0			0xA0E8
-		device pci 15.1 on
+		end
+		device ref i2c1 on
 			chip drivers/i2c/hid
 				register "generic.hid" = ""GDIX0000""
 				register "generic.desc" = ""Goodix Touchscreen""
@@ -139,8 +139,8 @@
 				register "has_power_resource" = "1"
 				device i2c 39 on end
 			end
-		end # I2C1				0xA0E9
-		device pci 15.2 on
+		end
+		device ref i2c2 on
 			chip drivers/i2c/sx9310
 				register "desc" = ""SAR0 Proximity Sensor""
 				register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_F14_IRQ)"
@@ -171,8 +171,8 @@
 				register "reg_sar_ctrl2" = "0x3c"
 				device i2c 28 on end
 			end
-		end # I2C2				0xA0EA
-		device pci 19.1 on
+		end
+		device ref i2c5 on
 			chip drivers/i2c/generic
 				register "hid" = ""ELAN0000""
 				register "desc" = ""ELAN Touchpad""
@@ -181,8 +181,8 @@
 				register "probed" = "1"
 				device i2c 15 on end
 			end
-		end # I2C5				0xA0C6
-		device pci 1f.2 hidden
+		end
+		device ref pmc hidden
 			# The pmc_mux chip driver is a placeholder for the
 			# PMC.MUX device in the ACPI hierarchy.
 			chip drivers/intel/pmc_mux
@@ -203,6 +203,6 @@
 					end
 				end
 			end
-		end # PMC
+		end
 	end
 end