mb/lenovo/t420s/devicetree: Use subsystemid inheritance

Change-Id: Ia77f0ce89b2234b9c164bb326d76bef98949832a
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37285
Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

1 files changed, 11 insertions, 29 deletions

diff --git a/src/mainboard/lenovo/t420s/devicetree.cb b/src/mainboard/lenovo/t420s/devicetree.cb
index aa6cc68154..c91b04e919 100644
--- a/src/mainboard/lenovo/t420s/devicetree.cb
+++ b/src/mainboard/lenovo/t420s/devicetree.cb
@@ -36,9 +36,9 @@ chip northbridge/intel/sandybridge
 	register "pci_mmio_size" = "2048"
 
 	device domain 0 on
-		device pci 00.0 on
-			subsystemid 0x17aa 0x21d2
-		end # host bridge
+		subsystemid 0x17aa 0x21d2 inherit
+
+		device pci 00.0 on end # host bridge
 		device pci 01.0 on end # NVIDIA Corporation GF119M [NVS 4200M]
 		device pci 02.0 on
 			subsystemid 0x17aa 0x21d3
@@ -79,36 +79,23 @@ chip northbridge/intel/sandybridge
 			device pci 19.0 on
 				subsystemid 0x17aa 0x21ce
 			end # Intel Gigabit Ethernet
-			device pci 1a.0 on
-				subsystemid 0x17aa 0x21d2
-			end # USB Enhanced Host Controller #2
-			device pci 1b.0 on
-				subsystemid 0x17aa 0x21d2
-			end # High Definition Audio Controller
+			device pci 1a.0 on end # USB Enhanced Host Controller #2
+			device pci 1b.0 on end # High Definition Audio Controller
 			device pci 1c.0 off end # PCIe Port #1
-			device pci 1c.1 on
-				subsystemid 0x17aa 0x21d2
-			end # PCIe Port #2 Integrated Wireless LAN
+			device pci 1c.1 on end # PCIe Port #2 Integrated Wireless LAN
 			device pci 1c.2 off end # PCIe Port #3
 			device pci 1c.3 on
-				subsystemid 0x17aa 0x21d2
 				smbios_slot_desc "7" "3" "ExpressCard Slot" "8"
 			end # PCIe Port #4 ExpressCard
 			device pci 1c.4 off end # PCIe Port #5
 			device pci 1c.5 off end # PCIe Port #6 Intel Gigabit Ethernet PHY (not PCIe)
-			device pci 1c.6 on
-				subsystemid 0x17aa 0x21d2
-			end # PCIe Port #7 NEC Corporation uPD720200A USB 3.0 Host Controller
+			device pci 1c.6 on end # PCIe Port #7 NEC Corporation uPD720200A USB 3.0 Host Controller
 			device pci 1c.7 off end # PCIe Port #8
-			device pci 1d.0 on
-				subsystemid 0x17aa 0x21d2
-			end # USB Enhanced Host Controller #1
+			device pci 1d.0 on end # USB Enhanced Host Controller #1
 			device pci 1e.0 off end # PCI bridge
 			device pci 1f.0 on
-				subsystemid 0x17aa 0x21d2
 				chip ec/lenovo/pmh7
-					device pnp ff.1 on # dummy
-					end
+					device pnp ff.1 on end # dummy
 					register "backlight_enable" = "0x01"
 					register "dock_event_enable" = "0x01"
 				end
@@ -168,11 +155,8 @@ chip northbridge/intel/sandybridge
 					register "has_thinker1" = "1"
 				end
 			end # LPC Controller
-			device pci 1f.2 on
-				subsystemid 0x17aa 0x21d2
-			end # 6 port SATA AHCI Controller
+			device pci 1f.2 on end # 6 port SATA AHCI Controller
 			device pci 1f.3 on
-				subsystemid 0x17aa 0x21d2
 				# eeprom, 8 virtual devices, same chip
 				chip drivers/i2c/at24rf08c
 					device i2c 54 on end
@@ -186,9 +170,7 @@ chip northbridge/intel/sandybridge
 				end
 			end # SMBus Controller
 			device pci 1f.5 off end # SATA Controller 2
-			device pci 1f.6 on
-				subsystemid 0x17aa 0x21d2
-			end # Thermal
+			device pci 1f.6 on end # Thermal
 		end
 	end
 end