Peter Lemenkov has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/37285 )
Change subject: mb/lenovo/t420s/devicetree: Use subsystemid inheritance ......................................................................
mb/lenovo/t420s/devicetree: Use subsystemid inheritance
Change-Id: Ia77f0ce89b2234b9c164bb326d76bef98949832a Signed-off-by: Peter Lemenkov lemenkov@gmail.com --- M src/mainboard/lenovo/t420s/devicetree.cb 1 file changed, 13 insertions(+), 29 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/85/37285/1
diff --git a/src/mainboard/lenovo/t420s/devicetree.cb b/src/mainboard/lenovo/t420s/devicetree.cb index aa6cc68..d4c69dc 100644 --- a/src/mainboard/lenovo/t420s/devicetree.cb +++ b/src/mainboard/lenovo/t420s/devicetree.cb @@ -1,4 +1,5 @@ chip northbridge/intel/sandybridge + # IGD Displays register "gfx.ndid" = "3" register "gfx.did" = "{ 0x80000100, 0x80000240, 0x80000410, 0x80000410, 0x00000005 }"
@@ -36,9 +37,9 @@ 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 @@ -69,6 +70,7 @@
register "c2_latency" = "101" # c2 not supported
+ # device specific SPI configuration register "spi_uvscc" = "0x2005" register "spi_lvscc" = "0x2005"
@@ -79,36 +81,23 @@ 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 +157,8 @@ 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 +172,7 @@ 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
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37285 )
Change subject: mb/lenovo/t420s/devicetree: Use subsystemid inheritance ......................................................................
Patch Set 1:
(3 comments)
https://review.coreboot.org/c/coreboot/+/37285/1/src/mainboard/lenovo/t420s/... File src/mainboard/lenovo/t420s/devicetree.cb:
https://review.coreboot.org/c/coreboot/+/37285/1/src/mainboard/lenovo/t420s/... PS1, Line 2: # IGD Displays This change is out of the scope of this commit
https://review.coreboot.org/c/coreboot/+/37285/1/src/mainboard/lenovo/t420s/... PS1, Line 73: # device specific SPI configuration This one as well
https://review.coreboot.org/c/coreboot/+/37285/1/src/mainboard/lenovo/t420s/... PS1, Line 84: device pci 1a.0 on end # USB Enhanced Host Controller #2 Nit: add a space after each `on` so that all the instances of `end` are aligned
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37285 )
Change subject: mb/lenovo/t420s/devicetree: Use subsystemid inheritance ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/37285/1/src/mainboard/lenovo/t420s/... File src/mainboard/lenovo/t420s/devicetree.cb:
https://review.coreboot.org/c/coreboot/+/37285/1/src/mainboard/lenovo/t420s/... PS1, Line 2: # IGD Displays
This change is out of the scope of this commit
Um, let me rephrase: this is not mentioned in the commit message, so it struck as odd. I see the comment comes from the t420 devicetree, but why?
Patrick Rudolph has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37285 )
Change subject: mb/lenovo/t420s/devicetree: Use subsystemid inheritance ......................................................................
Patch Set 1: Code-Review+1
HAOUAS Elyes has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37285 )
Change subject: mb/lenovo/t420s/devicetree: Use subsystemid inheritance ......................................................................
Patch Set 2: Code-Review+2
Hello Alexander Couzens, Patrick Rudolph, HAOUAS Elyes, build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/37285
to look at the new patch set (#3).
Change subject: mb/lenovo/t420s/devicetree: Use subsystemid inheritance ......................................................................
mb/lenovo/t420s/devicetree: Use subsystemid inheritance
Change-Id: Ia77f0ce89b2234b9c164bb326d76bef98949832a Signed-off-by: Peter Lemenkov lemenkov@gmail.com --- M src/mainboard/lenovo/t420s/devicetree.cb 1 file changed, 11 insertions(+), 29 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/85/37285/3
HAOUAS Elyes has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37285 )
Change subject: mb/lenovo/t420s/devicetree: Use subsystemid inheritance ......................................................................
Patch Set 3: Code-Review+2
Peter Lemenkov has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37285 )
Change subject: mb/lenovo/t420s/devicetree: Use subsystemid inheritance ......................................................................
Patch Set 3:
(2 comments)
https://review.coreboot.org/c/coreboot/+/37285/1/src/mainboard/lenovo/t420s/... File src/mainboard/lenovo/t420s/devicetree.cb:
https://review.coreboot.org/c/coreboot/+/37285/1/src/mainboard/lenovo/t420s/... PS1, Line 2: # IGD Displays
Um, let me rephrase: this is not mentioned in the commit message, so it struck as odd. […]
Removed added comment here.
https://review.coreboot.org/c/coreboot/+/37285/1/src/mainboard/lenovo/t420s/... PS1, Line 73: # device specific SPI configuration
This one as well
Removed added commend here
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37285 )
Change subject: mb/lenovo/t420s/devicetree: Use subsystemid inheritance ......................................................................
Patch Set 3:
(2 comments)
https://review.coreboot.org/c/coreboot/+/37285/1/src/mainboard/lenovo/t420s/... File src/mainboard/lenovo/t420s/devicetree.cb:
https://review.coreboot.org/c/coreboot/+/37285/1/src/mainboard/lenovo/t420s/... PS1, Line 2: # IGD Displays
Removed added comment here.
Ack
https://review.coreboot.org/c/coreboot/+/37285/1/src/mainboard/lenovo/t420s/... PS1, Line 73: # device specific SPI configuration
Removed added commend here
Ack
Patrick Georgi has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37285 )
Change subject: mb/lenovo/t420s/devicetree: Use subsystemid inheritance ......................................................................
Patch Set 3:
(1 comment)
https://review.coreboot.org/c/coreboot/+/37285/1/src/mainboard/lenovo/t420s/... File src/mainboard/lenovo/t420s/devicetree.cb:
https://review.coreboot.org/c/coreboot/+/37285/1/src/mainboard/lenovo/t420s/... PS1, Line 84: device pci 1a.0 on end # USB Enhanced Host Controller #2
Nit: add a space after each `on` so that all the instances of `end` are aligned
Ack
Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/37285 )
Change subject: mb/lenovo/t420s/devicetree: Use subsystemid inheritance ......................................................................
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 --- M src/mainboard/lenovo/t420s/devicetree.cb 1 file changed, 11 insertions(+), 29 deletions(-)
Approvals: build bot (Jenkins): Verified HAOUAS Elyes: Looks good to me, approved
diff --git a/src/mainboard/lenovo/t420s/devicetree.cb b/src/mainboard/lenovo/t420s/devicetree.cb index aa6cc68..c91b04e 100644 --- a/src/mainboard/lenovo/t420s/devicetree.cb +++ b/src/mainboard/lenovo/t420s/devicetree.cb @@ -36,9 +36,9 @@ 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 @@ 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 @@ 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 @@ 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