Change in coreboot[master]: mb/lenovo/t431s/devicetree: Use subsystemid inheritance

[Peter Lemenkov (Code Review)]

Peter Lemenkov has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/37301 )

Change subject: mb/lenovo/t431s/devicetree: Use subsystemid inheritance
......................................................................

mb/lenovo/t431s/devicetree: Use subsystemid inheritance

Change-Id: I247129317799d342b28f2c0ed68949ecbe7d9c75
Signed-off-by: Peter Lemenkov 
---
M src/mainboard/lenovo/t430s/variants/t431s/overridetree.cb
1 file changed, 6 insertions(+), 33 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/01/37301/1

diff --git a/src/mainboard/lenovo/t430s/variants/t431s/overridetree.cb b/src/mainboard/lenovo/t430s/variants/t431s/overridetree.cb
index e69f727..1a4b67a 100644
--- a/src/mainboard/lenovo/t430s/variants/t431s/overridetree.cb
+++ b/src/mainboard/lenovo/t430s/variants/t431s/overridetree.cb
@@ -13,47 +13,26 @@
    register "gpu_cpu_backlight" = "0x03d2"

device domain 0 on
-		device pci 00.0 on
-			subsystemid 0x17aa 0x2208
-		end # host bridge
+		subsystemid 0x17aa 0x2208 inherit
+
    	device pci 01.0 off end # PCIe Bridge for discrete graphics
-		device pci 02.0 on
-			subsystemid 0x17aa 0x2208
-		end # Integrated Graphics Controller
+
    	chip southbridge/intel/bd82x6x # Intel Series 7 Panther Point PCH
    		# Enable SATA ports 0 (HDD bay) & 1 (WWAN M.2 SATA) & 4 (dock)
    		register "sata_port_map" = "0x13"
    		# T431s has no Express Card slot.
    		register "pcie_hotplug_map" = "{ 0, 0, 0, 0, 0, 0, 0, 0 }"
-			device pci 14.0 on
-				subsystemid 0x17aa 0x2208
-			end # USB 3.0 Controller
-			device pci 1a.0 on
-				subsystemid 0x17aa 0x2208
-			end # USB Enhanced Host Controller #2
-			device pci 1b.0 on
-				subsystemid 0x17aa 0x2208
-			end # High Definition Audio Controller
+
    		device pci 1c.0 on # PCIe Port #1
-				subsystemid 0x17aa 0x2208
    			chip drivers/ricoh/rce822 # Ricoh cardreader
    				register "disable_mask" = "0x87"
    				register "sdwppol" = "0"
-					device pci 00.0 on # Ricoh SD card reader
-						subsystemid 0x17aa 0x2208
-					end
+					device pci 00.0 on end # Ricoh SD card reader
    			end
    		end
-			device pci 1c.1 on
-				subsystemid 0x17aa 0x2208
-			end # PCIe Port #2 Integrated Wireless LAN
+
    		device pci 1c.2 off end # PCIe Port #3
-			device pci 1d.0 on
-				subsystemid 0x17aa 0x2208
-			end # USB Enhanced Host Controller #1
-			device pci 1e.0 off end # PCI bridge
    		device pci 1f.0 on
-				subsystemid 0x17aa 0x2208
    			chip ec/lenovo/h8
    				register "config0" = "0xa6"
    				register "config1" = "0x09"
@@ -63,12 +42,6 @@
    				register "has_bdc_detection" = "0"
    			end
    		end # LPC Controller
-			device pci 1f.2 on
-				subsystemid 0x17aa 0x2208
-			end # 6 port SATA AHCI Controller
-			device pci 1f.3 on
-				subsystemid 0x17aa 0x2208
-			end # SMBus Controller
    		device pci 1f.6 off end # Thermal
    	end
    end

[HAOUAS Elyes (Code Review)]

HAOUAS Elyes has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37301 )

Change subject: mb/lenovo/t431s/devicetree: Use subsystemid inheritance
......................................................................

Patch Set 3:

Current change does more than using subsystemid inheritance

[Peter Lemenkov (Code Review)]

Hello Alexander Couzens, Patrick Rudolph, build bot (Jenkins),

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/37301

to look at the new patch set (#5).

Change subject: mb/lenovo/t431s/devicetree: Use subsystemid inheritance
......................................................................

mb/lenovo/t431s/devicetree: Use subsystemid inheritance

Change-Id: I247129317799d342b28f2c0ed68949ecbe7d9c75
Signed-off-by: Peter Lemenkov 
---
M 3rdparty/fsp
M src/mainboard/lenovo/t430s/variants/t431s/overridetree.cb
2 files changed, 13 insertions(+), 33 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/01/37301/5

[Peter Lemenkov (Code Review)]

Peter Lemenkov has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37301 )

Change subject: mb/lenovo/t431s/devicetree: Use subsystemid inheritance
......................................................................

Patch Set 4:
> Patch Set 3:
>
> Current change does more than using subsystemid inheritance

Splitted off devicetree rebalancing into its own patch.

[Peter Lemenkov (Code Review)]

Hello Alexander Couzens, Patrick Rudolph, build bot (Jenkins),

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/37301

to look at the new patch set (#7).

Change subject: mb/lenovo/t431s/devicetree: Use subsystemid inheritance
......................................................................

mb/lenovo/t431s/devicetree: Use subsystemid inheritance

Change-Id: I247129317799d342b28f2c0ed68949ecbe7d9c75
Signed-off-by: Peter Lemenkov 
---
M src/mainboard/lenovo/t430s/variants/t431s/overridetree.cb
1 file changed, 12 insertions(+), 32 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/01/37301/7

[Patrick Rudolph (Code Review)]

Patrick Rudolph has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37301 )

Change subject: mb/lenovo/t431s/devicetree: Use subsystemid inheritance
......................................................................

Patch Set 8: Code-Review+2

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37301 )

Change subject: mb/lenovo/t431s/devicetree: Use subsystemid inheritance
......................................................................

Patch Set 8: Code-Review+2

[Nico Huber (Code Review)]

Nico Huber has submitted this change. ( https://review.coreboot.org/c/coreboot/+/37301 )

Change subject: mb/lenovo/t431s/devicetree: Use subsystemid inheritance
......................................................................

mb/lenovo/t431s/devicetree: Use subsystemid inheritance

Change-Id: I247129317799d342b28f2c0ed68949ecbe7d9c75
Signed-off-by: Peter Lemenkov 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37301
Reviewed-by: Patrick Rudolph 
Reviewed-by: Angel Pons 
Tested-by: build bot (Jenkins) 
---
M src/mainboard/lenovo/t430s/variants/t431s/overridetree.cb
1 file changed, 12 insertions(+), 32 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Patrick Rudolph: Looks good to me, approved
  Angel Pons: Looks good to me, approved

diff --git a/src/mainboard/lenovo/t430s/variants/t431s/overridetree.cb b/src/mainboard/lenovo/t430s/variants/t431s/overridetree.cb
index e69f727..e3388de 100644
--- a/src/mainboard/lenovo/t430s/variants/t431s/overridetree.cb
+++ b/src/mainboard/lenovo/t430s/variants/t431s/overridetree.cb
@@ -13,47 +13,31 @@
    register "gpu_cpu_backlight" = "0x03d2"

device domain 0 on
-		device pci 00.0 on
-			subsystemid 0x17aa 0x2208
-		end # host bridge
+		subsystemid 0x17aa 0x2208 inherit
+
+		device pci 00.0 on end # host bridge
    	device pci 01.0 off end # PCIe Bridge for discrete graphics
-		device pci 02.0 on
-			subsystemid 0x17aa 0x2208
-		end # Integrated Graphics Controller
+		device pci 02.0 on end # Integrated Graphics Controller
    	chip southbridge/intel/bd82x6x # Intel Series 7 Panther Point PCH
    		# Enable SATA ports 0 (HDD bay) & 1 (WWAN M.2 SATA) & 4 (dock)
    		register "sata_port_map" = "0x13"
    		# T431s has no Express Card slot.
    		register "pcie_hotplug_map" = "{ 0, 0, 0, 0, 0, 0, 0, 0 }"
-			device pci 14.0 on
-				subsystemid 0x17aa 0x2208
-			end # USB 3.0 Controller
-			device pci 1a.0 on
-				subsystemid 0x17aa 0x2208
-			end # USB Enhanced Host Controller #2
-			device pci 1b.0 on
-				subsystemid 0x17aa 0x2208
-			end # High Definition Audio Controller
+			device pci 14.0 on end # USB 3.0 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 on # PCIe Port #1
-				subsystemid 0x17aa 0x2208
    			chip drivers/ricoh/rce822 # Ricoh cardreader
    				register "disable_mask" = "0x87"
    				register "sdwppol" = "0"
-					device pci 00.0 on # Ricoh SD card reader
-						subsystemid 0x17aa 0x2208
-					end
+					device pci 00.0 on end # Ricoh SD card reader
    			end
    		end
-			device pci 1c.1 on
-				subsystemid 0x17aa 0x2208
-			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 1d.0 on
-				subsystemid 0x17aa 0x2208
-			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 0x2208
    			chip ec/lenovo/h8
    				register "config0" = "0xa6"
    				register "config1" = "0x09"
@@ -63,12 +47,8 @@
    				register "has_bdc_detection" = "0"
    			end
    		end # LPC Controller
-			device pci 1f.2 on
-				subsystemid 0x17aa 0x2208
-			end # 6 port SATA AHCI Controller
-			device pci 1f.3 on
-				subsystemid 0x17aa 0x2208
-			end # SMBus Controller
+			device pci 1f.2 on end # 6 port SATA AHCI Controller
+			device pci 1f.3 on end # SMBus Controller
    		device pci 1f.6 off end # Thermal
    	end
    end