mb/*: Replace SNB PCI devices with references from chipset.cb

Removing default on/off from mainboard devicetrees is left as a follow-up.

Change-Id: I74c34a97ea4340fb11a0db422a48e1418221627e
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/69502
Reviewed-by: Jakub Czapiga <jacz@semihalf.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Elyes Haouas <ehaouas@noos.fr>

2 files changed, 38 insertions, 38 deletions

diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/devicetree.cb b/src/mainboard/gigabyte/ga-b75m-d3h/devicetree.cb
index d7263c825d..b0ef1ee4ea 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3h/devicetree.cb
+++ b/src/mainboard/gigabyte/ga-b75m-d3h/devicetree.cb
@@ -1,11 +1,11 @@
 chip northbridge/intel/sandybridge
 	device domain 0 on
 		subsystemid 0x1458 0x5000 inherit
-		device pci 00.0 on	# Host bridge
+		device ref host_bridge on	# Host bridge
 			subsystemid 0x1458 0x5000
 		end
-		device pci 01.0 on end	# PCIe Bridge for discrete graphics
-		device pci 02.0 on	# Integrated VGA controller
+		device ref peg10 on end	# PCIe Bridge for discrete graphics
+		device ref igd on	# Integrated VGA controller
 			subsystemid 0x1458 0xd000
 		end
 
@@ -20,37 +20,37 @@ chip northbridge/intel/sandybridge
 			register "superspeed_capable_ports" = "0xf"
 
 
-			device pci 14.0 on	# USB 3.0 Controller
+			device ref xhci on	# USB 3.0 Controller
 				subsystemid 0x1458 0x5007
 			end
-			device pci 16.0 on  end	# Management Engine Interface 1
-			device pci 16.1 off end	# Management Engine Interface 2
-			device pci 16.2 off end	# Management Engine IDE-R
-			device pci 16.3 off end	# Management Engine KT
-			device pci 19.0 off end	# Intel Gigabit Ethernet
-			device pci 1a.0 on	# USB2 EHCI #2
+			device ref mei1 on  end	# Management Engine Interface 1
+			device ref mei2 off end	# Management Engine Interface 2
+			device ref me_ide_r off end	# Management Engine IDE-R
+			device ref me_kt off end	# Management Engine KT
+			device ref gbe off end	# Intel Gigabit Ethernet
+			device ref ehci2 on	# USB2 EHCI #2
 				subsystemid 0x1458 0x5006
 			end
-			device pci 1b.0 on	# High Definition Audio
+			device ref hda on	# High Definition Audio
 				subsystemid 0x1458 0xa002
 			end
-			device pci 1c.0 on  end	# PCIe Port #1
-			device pci 1c.1 off end	# PCIe Port #2
-			device pci 1c.2 off end	# PCIe Port #3
-			device pci 1c.3 off end	# PCIe Port #4
-			device pci 1c.4 on	# PCIe Port #5
+			device ref pcie_rp1 on  end	# PCIe Port #1
+			device ref pcie_rp2 off end	# PCIe Port #2
+			device ref pcie_rp3 off end	# PCIe Port #3
+			device ref pcie_rp4 off end	# PCIe Port #4
+			device ref pcie_rp5 on	# PCIe Port #5
 				device pci 00.0 on	# PCI 10ec:8168
 					subsystemid 0x1458 0xe000
 				end
 			end
-			device pci 1c.5 off end	# PCIe Port #6
-			device pci 1c.6 off end	# PCIe Port #7
-			device pci 1c.7 off end	# PCIe Port #8
-			device pci 1d.0 on	# USB2 EHCI #1
+			device ref pcie_rp6 off end	# PCIe Port #6
+			device ref pcie_rp7 off end	# PCIe Port #7
+			device ref pcie_rp8 off end	# PCIe Port #8
+			device ref ehci1 on	# USB2 EHCI #1
 				subsystemid 0x1458 0x5006
 			end
-			device pci 1e.0 on end # PCI bridge
-			device pci 1f.0 on # ISA/LPC bridge
+			device ref pci_bridge on end # PCI bridge
+			device ref lpc on # ISA/LPC bridge
 				subsystemid 0x1458 0x5001
 				chip superio/ite/it8728f
 					device pnp 2e.0 off end	# FDC
@@ -88,14 +88,14 @@ chip northbridge/intel/sandybridge
 					device pnp 0c31.0 on end
 				end
 			end
-			device pci 1f.2 on	# SATA Controller 1
+			device ref sata1 on	# SATA Controller 1
 				subsystemid 0x1458 0xb005
 			end
-			device pci 1f.3 on	# SMBus
+			device ref smbus on	# SMBus
 				subsystemid 0x1458 0x5001
 			end
 			device pci 1f.4 off end
-			device pci 1f.5 off end	# SATA Controller 2
+			device ref sata2 off end	# SATA Controller 2
 		end
 	end
 end
diff --git a/src/mainboard/gigabyte/ga-h61m-series/devicetree.cb b/src/mainboard/gigabyte/ga-h61m-series/devicetree.cb
index 299c134af1..8b602a3b7b 100644
--- a/src/mainboard/gigabyte/ga-h61m-series/devicetree.cb
+++ b/src/mainboard/gigabyte/ga-h61m-series/devicetree.cb
@@ -4,9 +4,9 @@ chip northbridge/intel/sandybridge
 	device domain 0 on
 		subsystemid 0x1458 0x5000 inherit
 
-		device pci 00.0 on end	# Host bridge
-		device pci 01.0 on end	# PEG
-		device pci 02.0 on end	# iGPU
+		device ref host_bridge on end	# Host bridge
+		device ref peg10 on end	# PEG
+		device ref igd on end	# iGPU
 
 		chip southbridge/intel/bd82x6x # Intel Series 6 Cougar Point PCH
 			register "gen1_dec" = "0x003c0a01"
@@ -15,17 +15,17 @@ chip northbridge/intel/sandybridge
 			register "spi_lvscc" = "0x2005"
 			register "spi_uvscc" = "0x2005"
 
-			device pci 16.0 on  end	# MEI #1
-			device pci 1a.0 on  end	# USB2 EHCI #2
-			device pci 1b.0 on  end	# HD Audio
+			device ref mei1 on  end	# MEI #1
+			device ref ehci2 on  end	# USB2 EHCI #2
+			device ref hda on  end	# HD Audio
 
-			device pci 1d.0 on  end	# USB2 EHCI #1
-			device pci 1e.0 off end	# PCI bridge
-			device pci 1f.0 on  end	# LPC bridge
-			device pci 1f.2 on  end	# SATA Controller 1
-			device pci 1f.3 on  end	# SMBus
-			device pci 1f.5 off end	# SATA Controller 2
-			device pci 1f.6 on  end	# Thermal
+			device ref ehci1 on  end	# USB2 EHCI #1
+			device ref pci_bridge off end	# PCI bridge
+			device ref lpc on  end	# LPC bridge
+			device ref sata1 on  end	# SATA Controller 1
+			device ref smbus on  end	# SMBus
+			device ref sata2 off end	# SATA Controller 2
+			device ref thermal on  end	# Thermal
 		end
 	end
 end