mb/hp/*/devicetree.cb: Inherit the subsystemid

Since all the `subsystemid` lines in these devicetrees use the same
values, factor them out via inheritance.

There are some exceptions though. There are some enabled devices which
lack a `subsystemid` entry. Looks like HP uses the same subsystem ID
on every device, so assume that these devices should also use that
subsystem ID as well.

While we are at it, tidy up all the now-empty device blocks.

Change-Id: Iccd74fff9456e1204735a80ecc4f7685624cb78e
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/38081
Reviewed-by: Nico Huber <nico.h@gmx.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

1 files changed, 28 insertions, 69 deletions

diff --git a/src/mainboard/hp/z220_sff_workstation/devicetree.cb b/src/mainboard/hp/z220_sff_workstation/devicetree.cb
index 5108db4a65..94d079a11c 100644
--- a/src/mainboard/hp/z220_sff_workstation/devicetree.cb
+++ b/src/mainboard/hp/z220_sff_workstation/devicetree.cb
@@ -39,6 +39,7 @@ chip northbridge/intel/sandybridge
 	register "pci_mmio_size" = "2048"
 
 	device domain 0x0 on
+		subsystemid 0x103c 0x1791 inherit
 		chip southbridge/intel/bd82x6x # Intel Series 7 PCH
 			register "c2_latency" = "0x0065"
 			register "docking_supported" = "0"
@@ -50,56 +51,26 @@ chip northbridge/intel/sandybridge
 			register "sata_port_map" = "0xf"
 			register "spi_lvscc" = "0x2005"
 			register "spi_uvscc" = "0x2005"
-			device pci 14.0 on # xHCI
-				subsystemid 0x103c 0x1791
-			end
-			device pci 16.0 on # Management Engine Interface 1
-				subsystemid 0x103c 0x1791
-			end
-			device pci 16.1 off # Management Engine Interface 2
-			end
-			device pci 16.2 off # Management Engine IDE-R
-			end
-			device pci 16.3 on # Management Engine KT
-				subsystemid 0x103c 0x1791
-			end
-			device pci 19.0 on # Intel Gigabit Ethernet
-				subsystemid 0x103c 0x1791
-			end
-			device pci 1a.0 on # USB2 EHCI #2
-				subsystemid 0x103c 0x1791
-			end
-			device pci 1b.0 on # High Definition Audio Audio controller
-				subsystemid 0x103c 0x1791
-			end
-			device pci 1c.0 on # PCIe Port #1
-				subsystemid 0x103c 0x1791
-			end
-			device pci 1c.1 off # PCIe Port #2
-			end
-			device pci 1c.2 off # PCIe Port #3
-			end
-			device pci 1c.3 off # PCIe Port #4
-			end
-			device pci 1c.4 on # PCIe Port #5
-				subsystemid 0x103c 0x1791
-			end
-			device pci 1c.5 off # PCIe Port #6
-			end
-			device pci 1c.6 on # PCIe Port #7
-				subsystemid 0x103c 0x1791
-			end
-			device pci 1c.7 on # PCIe Port #8
-				subsystemid 0x103c 0x1791
-			end
-			device pci 1d.0 on # USB2 EHCI #1
-				subsystemid 0x103c 0x1791
-			end
-			device pci 1e.0 on # PCI bridge
-				subsystemid 0x103c 0x1791
-			end
-			device pci 1f.0 on # LPC bridge PCI-LPC bridge
-				subsystemid 0x103c 0x1791
+
+			device pci 14.0 on  end	# xHCI
+			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 on  end	# Management Engine KT
+			device pci 19.0 on  end	# Intel Gigabit Ethernet
+			device pci 1a.0 on  end	# USB2 EHCI #2
+			device pci 1b.0 on  end	# High Definition Audio Audio controller
+			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  end	# PCIe Port #5
+			device pci 1c.5 off end	# PCIe Port #6
+			device pci 1c.6 on  end	# PCIe Port #7
+			device pci 1c.7 on  end	# PCIe Port #8
+			device pci 1d.0 on  end	# USB2 EHCI #1
+			device pci 1e.0 on  end	# PCI bridge
+			device pci 1f.0 on	# LPC bridge PCI-LPC bridge
 				chip superio/nuvoton/npcd378
 					device pnp 2e.0 off end		# Floppy
 					device pnp 2e.1 on		# Parallel port
@@ -200,25 +171,13 @@ chip northbridge/intel/sandybridge
 					device pnp 4e.0 on end          # TPM module
 				end
 			end
-			device pci 1f.2 on # SATA Controller 1
-				subsystemid 0x103c 0x1791
-			end
-			device pci 1f.3 on # SMBus
-				subsystemid 0x103c 0x1791
-			end
-			device pci 1f.5 off # SATA Controller 2
-			end
-			device pci 1f.6 off # Thermal
-			end
-		end
-		device pci 00.0 on # Host bridge Host bridge
-			subsystemid 0x103c 0x1791
-		end
-		device pci 01.0 on # PCIe Bridge for discrete graphics
-			subsystemid 0x103c 0x1791
-		end
-		device pci 02.0 on # Internal graphics VGA controller
-			subsystemid 0x103c 0x1791
+			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 off end	# Thermal
 		end
+		device pci 00.0 on  end	# Host bridge Host bridge
+		device pci 01.0 on  end	# PCIe Bridge for discrete graphics
+		device pci 02.0 on  end	# Internal graphics VGA controller
 	end
 end