Patrick Georgi submitted this change.

View Change

Approvals: build bot (Jenkins): Verified HAOUAS Elyes: Looks good to me, approved
mb/lenovo/x230/devicetree: Use subsystemid inheritance

Change-Id: I95dbf55b74deca1e035ee1d042f1549d2583e346
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37298
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr>
---
M src/mainboard/lenovo/x230/devicetree.cb
1 file changed, 14 insertions(+), 39 deletions(-)

diff --git a/src/mainboard/lenovo/x230/devicetree.cb b/src/mainboard/lenovo/x230/devicetree.cb
index 61a5468..e492dda 100644
--- a/src/mainboard/lenovo/x230/devicetree.cb
+++ b/src/mainboard/lenovo/x230/devicetree.cb
@@ -37,13 +37,11 @@
register "pci_mmio_size" = "1024"

device domain 0 on
- device pci 00.0 on
- subsystemid 0x17aa 0x21fa
- end # host bridge
+ subsystemid 0x17aa 0x21fa 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 0x21fa
- end # vga controller
+ device pci 02.0 on end # vga controller

chip southbridge/intel/bd82x6x # Intel Series 6 Cougar Point PCH
# GPI routing
@@ -76,39 +74,25 @@
register "spi_uvscc" = "0x2005"
register "spi_lvscc" = "0x2005"

- device pci 14.0 on
- subsystemid 0x17aa 0x21fa
- end # USB 3.0 Controller
- device pci 16.0 on
- subsystemid 0x17aa 0x21fa
- end # Management Engine Interface 1
+ device pci 14.0 on end # USB 3.0 Controller
+ 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 on
subsystemid 0x17aa 0x21f3
end # Intel Gigabit Ethernet
- device pci 1a.0 on
- subsystemid 0x17aa 0x21fa
- end # USB2 EHCI #2
- device pci 1b.0 on
- subsystemid 0x17aa 0x21fa
- end # High Definition Audio
+ device pci 1a.0 on end # USB2 EHCI #2
+ device pci 1b.0 on end # High Definition Audio
device pci 1c.0 on
- subsystemid 0x17aa 0x21fa
chip drivers/ricoh/rce822
register "sdwppol" = "1"
register "disable_mask" = "0x87"
- device pci 00.0 on
- subsystemid 0x17aa 0x21fa
- end
+ device pci 00.0 on end
end
end # PCIe Port #1
- device pci 1c.1 on
- subsystemid 0x17aa 0x21fa
- end # PCIe Port #2
+ device pci 1c.1 on end # PCIe Port #2
device pci 1c.2 on
- subsystemid 0x17aa 0x21fa
smbios_slot_desc "7" "3" "ExpressCard Slot" "8"
end # PCIe Port #3 (expresscard)
device pci 1c.3 off end # PCIe Port #4
@@ -116,15 +100,11 @@
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
- subsystemid 0x17aa 0x21fa
- end # USB2 EHCI #1
+ device pci 1d.0 on end # USB2 EHCI #1
device pci 1e.0 off end # PCI bridge
device pci 1f.0 on #LPC bridge
- subsystemid 0x17aa 0x21fa
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
@@ -176,11 +156,8 @@
register "wwan_gpio_lvl" = "0"
end
end # LPC bridge
- device pci 1f.2 on
- subsystemid 0x17aa 0x21fa
- end # SATA Controller 1
+ device pci 1f.2 on end # SATA Controller 1
device pci 1f.3 on
- subsystemid 0x17aa 0x21fa
# eeprom, 8 virtual devices, same chip
chip drivers/i2c/at24rf08c
device i2c 54 on end
@@ -194,9 +171,7 @@
end
end # SMBus
device pci 1f.5 off end # SATA Controller 2
- device pci 1f.6 on
- subsystemid 0x17aa 0x21fa
- end # Thermal
+ device pci 1f.6 on end # Thermal
end
end
end

To view, visit change 37298. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I95dbf55b74deca1e035ee1d042f1549d2583e346
Gerrit-Change-Number: 37298
Gerrit-PatchSet: 5
Gerrit-Owner: Peter Lemenkov <lemenkov@gmail.com>
Gerrit-Reviewer: Alexander Couzens <lynxis@fe80.eu>
Gerrit-Reviewer: HAOUAS Elyes <ehaouas@noos.fr>
Gerrit-Reviewer: Patrick Georgi <pgeorgi@google.com>
Gerrit-Reviewer: Patrick Rudolph <siro@das-labor.org>
Gerrit-Reviewer: Peter Lemenkov <lemenkov@gmail.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>
Gerrit-MessageType: merged