diff options
| author | Sven Schnelle <svens@stackframe.org> | 2011-03-01 19:58:47 +0000 |
|---|---|---|
| committer | Sven Schnelle <svens@stackframe.org> | 2011-03-01 19:58:47 +0000 |
| commit | 91321028ec3fac017e8e2c47ec5fe7742409b3b0 (patch) | |
| tree | 738f9e0d9f124ef4670c5e21516695fc63fc6d46 | |
| parent | 270a908646273461b41e591739d778d3d675ff6f (diff) | |
| download | coreboot-91321028ec3fac017e8e2c47ec5fe7742409b3b0.tar.xz | |
Use subsystem id from devicetree.cb instead of Kconfig and move
all boards to the new config scheme.
Signed-off-by: Sven Schnelle <svens@stackframe.org>
Acked-by: Peter Stuge <peter@stuge.se>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6421 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
158 files changed, 132 insertions, 574 deletions
diff --git a/src/Kconfig b/src/Kconfig index 28915b2181..05b4adb55d 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -137,13 +137,6 @@ config PCI_BUS_SEGN_BITS int default 0 -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x0 - -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x0 config PCI_ROM_RUN bool default n diff --git a/src/devices/pci_device.c b/src/devices/pci_device.c index b6a8078be7..2ccb38a75e 100644 --- a/src/devices/pci_device.c +++ b/src/devices/pci_device.c @@ -586,16 +586,6 @@ void pci_dev_set_resources(struct device *dev) pci_write_config8(dev, PCI_CACHE_LINE_SIZE, 64 >> 2); } -unsigned __attribute__((weak)) mainboard_pci_subsystem_vendor_id(__attribute__((unused)) struct device *dev) -{ - return CONFIG_MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID; -} - -unsigned __attribute__((weak)) mainboard_pci_subsystem_device_id(__attribute__((unused)) struct device *dev) -{ - return CONFIG_MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID; -} - void pci_dev_enable_resources(struct device *dev) { const struct pci_operations *ops; @@ -604,12 +594,11 @@ void pci_dev_enable_resources(struct device *dev) /* Set the subsystem vendor and device ID for mainboard devices. */ ops = ops_pci(dev); if (dev->on_mainboard && ops && ops->set_subsystem) { - printk(BIOS_DEBUG, "%s subsystem <- %02x/%02x\n", dev_path(dev), - mainboard_pci_subsystem_vendor_id(dev), - mainboard_pci_subsystem_device_id(dev)); - ops->set_subsystem(dev, - mainboard_pci_subsystem_vendor_id(dev), - mainboard_pci_subsystem_device_id(dev)); + printk(BIOS_DEBUG, "%s subsystem <- %04x/%04x\n", + dev_path(dev), dev->subsystem_vendor, + dev->subsystem_device); + ops->set_subsystem(dev, dev->subsystem_vendor, + dev->subsystem_device); } command = pci_read_config16(dev, PCI_COMMAND); command |= dev->command; diff --git a/src/mainboard/amd/bimini_fam10/Kconfig b/src/mainboard/amd/bimini_fam10/Kconfig index d39da7bfdb..2118078dd0 100644 --- a/src/mainboard/amd/bimini_fam10/Kconfig +++ b/src/mainboard/amd/bimini_fam10/Kconfig @@ -91,14 +91,6 @@ config HEAP_SIZE hex default 0xc0000 -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x3060 - -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1022 - config RAMBASE hex default 0x200000 diff --git a/src/mainboard/amd/bimini_fam10/devicetree.cb b/src/mainboard/amd/bimini_fam10/devicetree.cb index 5916c9fb37..a5bec74e64 100644 --- a/src/mainboard/amd/bimini_fam10/devicetree.cb +++ b/src/mainboard/amd/bimini_fam10/devicetree.cb @@ -6,6 +6,7 @@ chip northbridge/amd/amdfam10/root_complex end end device pci_domain 0 on + subsystemid 0x1022 0x3060 inherit chip northbridge/amd/amdfam10 device pci 18.0 on # northbridge chip southbridge/amd/rs780 diff --git a/src/mainboard/amd/dbm690t/Kconfig b/src/mainboard/amd/dbm690t/Kconfig index d1e2649f8a..3d3a04cf62 100644 --- a/src/mainboard/amd/dbm690t/Kconfig +++ b/src/mainboard/amd/dbm690t/Kconfig @@ -59,12 +59,4 @@ config IRQ_SLOT_COUNT int default 11 -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1022 - -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x3050 - endif # BOARD_AMD_DBM690T diff --git a/src/mainboard/amd/dbm690t/devicetree.cb b/src/mainboard/amd/dbm690t/devicetree.cb index d13c5dadc1..e1b01b2c06 100644 --- a/src/mainboard/amd/dbm690t/devicetree.cb +++ b/src/mainboard/amd/dbm690t/devicetree.cb @@ -15,6 +15,7 @@ chip northbridge/amd/amdk8/root_complex end end device pci_domain 0 on + subsystemid 0x1022 0x3050 inherit chip northbridge/amd/amdk8 device pci 18.0 on # southbridge chip southbridge/amd/rs690 diff --git a/src/mainboard/amd/inagua/Kconfig b/src/mainboard/amd/inagua/Kconfig index 8a2c83478d..8e4eca96b5 100644 --- a/src/mainboard/amd/inagua/Kconfig +++ b/src/mainboard/amd/inagua/Kconfig @@ -118,14 +118,6 @@ config ACPI_SSDTX_NUM int default 0 -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x1510 - -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1022 - config RAMBASE hex default 0x200000 diff --git a/src/mainboard/amd/inagua/devicetree.cb b/src/mainboard/amd/inagua/devicetree.cb index a0a19ea4e1..acae2ca42b 100644 --- a/src/mainboard/amd/inagua/devicetree.cb +++ b/src/mainboard/amd/inagua/devicetree.cb @@ -23,6 +23,7 @@ chip northbridge/amd/agesa_wrapper/family14/root_complex end end device pci_domain 0 on + subsystemid 0x1022 0x1510 inherit chip northbridge/amd/agesa_wrapper/family14 # CPU side of HT root complex # device pci 18.0 on # northbridge chip northbridge/amd/agesa_wrapper/family14 # PCI side of HT root complex diff --git a/src/mainboard/amd/mahogany/Kconfig b/src/mainboard/amd/mahogany/Kconfig index 09adfcbaec..731002de4f 100644 --- a/src/mainboard/amd/mahogany/Kconfig +++ b/src/mainboard/amd/mahogany/Kconfig @@ -73,12 +73,4 @@ config IRQ_SLOT_COUNT int default 11 -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1022 - -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x3060 - endif # BOARD_AMD_MAHOGANY diff --git a/src/mainboard/amd/mahogany/devicetree.cb b/src/mainboard/amd/mahogany/devicetree.cb index 7965989617..d60d5a1f40 100644 --- a/src/mainboard/amd/mahogany/devicetree.cb +++ b/src/mainboard/amd/mahogany/devicetree.cb @@ -15,6 +15,7 @@ chip northbridge/amd/amdk8/root_complex end end device pci_domain 0 on + subsystemid 0x1022 0x3060 inherit chip northbridge/amd/amdk8 device pci 18.0 on # southbridge chip southbridge/amd/rs780 diff --git a/src/mainboard/amd/mahogany_fam10/Kconfig b/src/mainboard/amd/mahogany_fam10/Kconfig index 0f6c6b37c6..9c2e081aac 100644 --- a/src/mainboard/amd/mahogany_fam10/Kconfig +++ b/src/mainboard/amd/mahogany_fam10/Kconfig @@ -79,14 +79,6 @@ config HEAP_SIZE hex default 0xc0000 -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x3060 - -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1022 - config RAMBASE hex default 0x200000 diff --git a/src/mainboard/amd/mahogany_fam10/devicetree.cb b/src/mainboard/amd/mahogany_fam10/devicetree.cb index d1f26d114a..c51e53e7c9 100644 --- a/src/mainboard/amd/mahogany_fam10/devicetree.cb +++ b/src/mainboard/amd/mahogany_fam10/devicetree.cb @@ -6,6 +6,7 @@ chip northbridge/amd/amdfam10/root_complex end end device pci_domain 0 on + subsystemid 0x1022 0x3060 inherit chip northbridge/amd/amdfam10 device pci 18.0 on # northbridge chip southbridge/amd/rs780 diff --git a/src/mainboard/amd/persimmon/Kconfig b/src/mainboard/amd/persimmon/Kconfig index 650e7aa543..66c37f29f4 100644 --- a/src/mainboard/amd/persimmon/Kconfig +++ b/src/mainboard/amd/persimmon/Kconfig @@ -118,14 +118,6 @@ config ACPI_SSDTX_NUM int default 0 -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x1510 - -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1022 - config RAMBASE hex default 0x200000 diff --git a/src/mainboard/amd/persimmon/devicetree.cb b/src/mainboard/amd/persimmon/devicetree.cb index 48fd741ec8..8ca165b739 100644 --- a/src/mainboard/amd/persimmon/devicetree.cb +++ b/src/mainboard/amd/persimmon/devicetree.cb @@ -23,6 +23,7 @@ chip northbridge/amd/agesa_wrapper/family14/root_complex end end device pci_domain 0 on + subsystemid 0x1022 0x1510 inherit chip northbridge/amd/agesa_wrapper/family14 # CPU side of HT root complex # device pci 18.0 on # northbridge chip northbridge/amd/agesa_wrapper/family14 # PCI side of HT root complex diff --git a/src/mainboard/amd/pistachio/Kconfig b/src/mainboard/amd/pistachio/Kconfig index b9f37b3188..487a59935c 100644 --- a/src/mainboard/amd/pistachio/Kconfig +++ b/src/mainboard/amd/pistachio/Kconfig @@ -71,12 +71,4 @@ config IRQ_SLOT_COUNT int default 11 -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1022 - -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x3050 - endif # BOARD_AMD_PISTACHIO diff --git a/src/mainboard/amd/pistachio/devicetree.cb b/src/mainboard/amd/pistachio/devicetree.cb index 76f0fe7fc7..6608fddebf 100644 --- a/src/mainboard/amd/pistachio/devicetree.cb +++ b/src/mainboard/amd/pistachio/devicetree.cb @@ -15,6 +15,7 @@ chip northbridge/amd/amdk8/root_complex end end device pci_domain 0 on + subsystemid 0x1022 0x3050 inherit chip northbridge/amd/amdk8 device pci 18.0 on # southbridge, K8 HT Configuration chip southbridge/amd/rs690 diff --git a/src/mainboard/amd/serengeti_cheetah/Kconfig b/src/mainboard/amd/serengeti_cheetah/Kconfig index 6a4aea1abb..f08fd6e0c5 100644 --- a/src/mainboard/amd/serengeti_cheetah/Kconfig +++ b/src/mainboard/amd/serengeti_cheetah/Kconfig @@ -82,14 +82,6 @@ config IRQ_SLOT_COUNT int default 11 -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1022 - -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x2b80 - config ACPI_SSDTX_NUM int default 4 diff --git a/src/mainboard/amd/serengeti_cheetah/devicetree.cb b/src/mainboard/amd/serengeti_cheetah/devicetree.cb index 8ea682fa5a..b819292d5d 100644 --- a/src/mainboard/amd/serengeti_cheetah/devicetree.cb +++ b/src/mainboard/amd/serengeti_cheetah/devicetree.cb @@ -5,6 +5,7 @@ chip northbridge/amd/amdk8/root_complex end end device pci_domain 0 on + subsystemid 0x1022 0x2b80 inherit chip northbridge/amd/amdk8 device pci 18.0 on # northbridge # devices on link 0, link 0 == LDT 0 diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig b/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig index a49e3c9f38..4c9d2a06bf 100644 --- a/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig +++ b/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig @@ -84,14 +84,6 @@ config ACPI_SSDTX_NUM int default 5 -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x2b80 - -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1022 - config RAMBASE hex default 0x200000 diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/devicetree.cb b/src/mainboard/amd/serengeti_cheetah_fam10/devicetree.cb index 7c36509bf8..bfbb2b309a 100644 --- a/src/mainboard/amd/serengeti_cheetah_fam10/devicetree.cb +++ b/src/mainboard/amd/serengeti_cheetah_fam10/devicetree.cb @@ -5,6 +5,7 @@ chip northbridge/amd/amdfam10/root_complex end end device pci_domain 0 on + subsystemid 0x1022 0x2b80 inherit chip northbridge/amd/amdfam10 device pci 18.0 on # northbridge # devices on link 0, link 0 == LDT 0 diff --git a/src/mainboard/amd/tilapia_fam10/Kconfig b/src/mainboard/amd/tilapia_fam10/Kconfig index 0d85f864df..b18115b8e9 100644 --- a/src/mainboard/amd/tilapia_fam10/Kconfig +++ b/src/mainboard/amd/tilapia_fam10/Kconfig @@ -79,14 +79,6 @@ config HEAP_SIZE hex default 0xc0000 -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x3060 - -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1022 - config RAMBASE hex default 0x200000 diff --git a/src/mainboard/amd/tilapia_fam10/devicetree.cb b/src/mainboard/amd/tilapia_fam10/devicetree.cb index 0a263610f1..aeb582a678 100644 --- a/src/mainboard/amd/tilapia_fam10/devicetree.cb +++ b/src/mainboard/amd/tilapia_fam10/devicetree.cb @@ -6,6 +6,7 @@ chip northbridge/amd/amdfam10/root_complex end end device pci_domain 0 on + subsystemid 0x1022 0x3060 inherit chip northbridge/amd/amdfam10 device pci 18.0 on # northbridge chip southbridge/amd/rs780 diff --git a/src/mainboard/arima/hdama/Kconfig b/src/mainboard/arima/hdama/Kconfig index 0019bb4398..7f0e40d6f9 100644 --- a/src/mainboard/arima/hdama/Kconfig +++ b/src/mainboard/arima/hdama/Kconfig @@ -21,14 +21,6 @@ config MAINBOARD_DIR string default arima/hdama -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x161f - -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x3016 - config APIC_ID_OFFSET hex default 0x0 diff --git a/src/mainboard/arima/hdama/devicetree.cb b/src/mainboard/arima/hdama/devicetree.cb index c908921076..d7252e226e 100644 --- a/src/mainboard/arima/hdama/devicetree.cb +++ b/src/mainboard/arima/hdama/devicetree.cb @@ -5,6 +5,7 @@ chip northbridge/amd/amdk8/root_complex end end device pci_domain 0 on + subsystemid 0x161f 0x3016 inherit chip northbridge/amd/amdk8 device pci 18.0 on # northbridge # devices on link 0, link 0 == LDT 0 diff --git a/src/mainboard/asrock/939a785gmh/Kconfig b/src/mainboard/asrock/939a785gmh/Kconfig index e3eb57a220..7021655996 100644 --- a/src/mainboard/asrock/939a785gmh/Kconfig +++ b/src/mainboard/asrock/939a785gmh/Kconfig @@ -74,12 +74,4 @@ config IRQ_SLOT_COUNT int default 11 -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1022 - -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x3060 - endif # BOARD_ASROCK_939A785GMH diff --git a/src/mainboard/asrock/939a785gmh/devicetree.cb b/src/mainboard/asrock/939a785gmh/devicetree.cb index 76f61b02c8..1dc92a3312 100644 --- a/src/mainboard/asrock/939a785gmh/devicetree.cb +++ b/src/mainboard/asrock/939a785gmh/devicetree.cb @@ -16,6 +16,7 @@ chip northbridge/amd/amdk8/root_complex end end device pci_domain 0 on + subsystemid 0x1022 0x3060 inherit chip northbridge/amd/amdk8 device pci 18.0 on # southbridge chip southbridge/amd/rs780 diff --git a/src/mainboard/asrock/e350m1/Kconfig b/src/mainboard/asrock/e350m1/Kconfig index 06fd4f0f34..9b73ea3240 100644 --- a/src/mainboard/asrock/e350m1/Kconfig +++ b/src/mainboard/asrock/e350m1/Kconfig @@ -118,14 +118,6 @@ config ACPI_SSDTX_NUM int default 0 -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x1510 - -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1022 - config RAMBASE hex default 0x200000 diff --git a/src/mainboard/asrock/e350m1/devicetree.cb b/src/mainboard/asrock/e350m1/devicetree.cb index 648db989c1..9dceae6700 100644 --- a/src/mainboard/asrock/e350m1/devicetree.cb +++ b/src/mainboard/asrock/e350m1/devicetree.cb @@ -23,6 +23,7 @@ chip northbridge/amd/agesa_wrapper/family14/root_complex end end device pci_domain 0 on + subsystemid 0x1022 0x1510 inherit chip northbridge/amd/agesa_wrapper/family14 # CPU side of HT root complex # device pci 18.0 on # northbridge chip northbridge/amd/agesa_wrapper/family14 # PCI side of HT root complex diff --git a/src/mainboard/asus/Kconfig b/src/mainboard/asus/Kconfig index bf8742a3f0..875fd5aa12 100644 --- a/src/mainboard/asus/Kconfig +++ b/src/mainboard/asus/Kconfig @@ -77,8 +77,4 @@ config MAINBOARD_VENDOR string default "ASUS" -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1043 - endif # VENDOR_ASUS diff --git a/src/mainboard/asus/a8n_e/Kconfig b/src/mainboard/asus/a8n_e/Kconfig index 6512589bfd..aca9e33d0e 100644 --- a/src/mainboard/asus/a8n_e/Kconfig +++ b/src/mainboard/asus/a8n_e/Kconfig @@ -70,12 +70,4 @@ config IRQ_SLOT_COUNT int default 13 -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1043 - -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x815a - endif # BOARD_ASUS_A8N_E diff --git a/src/mainboard/asus/a8n_e/devicetree.cb b/src/mainboard/asus/a8n_e/devicetree.cb index 1144f0c9ca..86bf3aa2e8 100644 --- a/src/mainboard/asus/a8n_e/devicetree.cb +++ b/src/mainboard/asus/a8n_e/devicetree.cb @@ -6,6 +6,7 @@ chip northbridge/amd/amdk8/root_complex # Root complex end device pci_domain 0 on # PCI domain + subsystemid 0x1043 0x815a inherit chip northbridge/amd/amdk8 # Northbridge / RAM controller device pci 18.0 on # Link 0 == LDT 0 chip southbridge/nvidia/ck804 # Southbridge diff --git a/src/mainboard/asus/a8v-e_deluxe/Kconfig b/src/mainboard/asus/a8v-e_deluxe/Kconfig index f9ac563aed..05408ca0a7 100644 --- a/src/mainboard/asus/a8v-e_deluxe/Kconfig +++ b/src/mainboard/asus/a8v-e_deluxe/Kconfig @@ -70,8 +70,4 @@ config HT_CHAIN_UNITID_BASE hex default 0x0 -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1043 - endif # BOARD_ASUS_A8V_E_DELUXE diff --git a/src/mainboard/asus/a8v-e_deluxe/devicetree.cb b/src/mainboard/asus/a8v-e_deluxe/devicetree.cb index cd803929c8..31df8fa3c1 100644 --- a/src/mainboard/asus/a8v-e_deluxe/devicetree.cb +++ b/src/mainboard/asus/a8v-e_deluxe/devicetree.cb @@ -5,6 +5,7 @@ chip northbridge/amd/amdk8/root_complex # Root complex end end device pci_domain 0 on # PCI domain + subsystemid 1043 0 inherit chip northbridge/amd/amdk8 # mc0 device pci 18.0 on # Northbridge # Devices on link 0, link 0 == LDT 0 diff --git a/src/mainboard/asus/a8v-e_se/Kconfig b/src/mainboard/asus/a8v-e_se/Kconfig index abf2bd9252..4975cfaebd 100644 --- a/src/mainboard/asus/a8v-e_se/Kconfig +++ b/src/mainboard/asus/a8v-e_se/Kconfig @@ -70,8 +70,4 @@ config HT_CHAIN_UNITID_BASE hex default 0x0 -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1043 - endif # BOARD_ASUS_A8V_E_SE diff --git a/src/mainboard/asus/a8v-e_se/devicetree.cb b/src/mainboard/asus/a8v-e_se/devicetree.cb index cd803929c8..3da93fedf7 100644 --- a/src/mainboard/asus/a8v-e_se/devicetree.cb +++ b/src/mainboard/asus/a8v-e_se/devicetree.cb @@ -5,6 +5,7 @@ chip northbridge/amd/amdk8/root_complex # Root complex end end device pci_domain 0 on # PCI domain + subsystemid 0x1043 0 inherit chip northbridge/amd/amdk8 # mc0 device pci 18.0 on # Northbridge # Devices on link 0, link 0 == LDT 0 diff --git a/src/mainboard/asus/m2n-e/Kconfig b/src/mainboard/asus/m2n-e/Kconfig index 60b7e15684..c23a2df91e 100644 --- a/src/mainboard/asus/m2n-e/Kconfig +++ b/src/mainboard/asus/m2n-e/Kconfig @@ -98,8 +98,4 @@ config SERIAL_CPU_INIT bool default n -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x8239 - endif # BOARD_ASUS_M2N_E diff --git a/src/mainboard/asus/m2n-e/devicetree.cb b/src/mainboard/asus/m2n-e/devicetree.cb index dbadf0ed77..bf4de2585a 100644 --- a/src/mainboard/asus/m2n-e/devicetree.cb +++ b/src/mainboard/asus/m2n-e/devicetree.cb @@ -25,6 +25,7 @@ chip northbridge/amd/amdk8/root_complex # Root complex end end device pci_domain 0 on # PCI domain + subsystemid 0x1043 0x8239 inherit chip northbridge/amd/amdk8 # Northbridge / RAM controller device pci 18.0 on # Link 0 == LDT 0 chip southbridge/nvidia/mcp55 # Southbridge diff --git a/src/mainboard/asus/m2v-mx_se/Kconfig b/src/mainboard/asus/m2v-mx_se/Kconfig index b6a2fe638f..09157ee22f 100644 --- a/src/mainboard/asus/m2v-mx_se/Kconfig +++ b/src/mainboard/asus/m2v-mx_se/Kconfig @@ -89,8 +89,4 @@ config HT_CHAIN_END_UNITID_BASE hex default 0x20 -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1043 - endif # BOARD_ASUS_M2V_MX_SE diff --git a/src/mainboard/asus/m2v-mx_se/devicetree.cb b/src/mainboard/asus/m2v-mx_se/devicetree.cb index 93a3a879ed..7e4c6d1079 100644 --- a/src/mainboard/asus/m2v-mx_se/devicetree.cb +++ b/src/mainboard/asus/m2v-mx_se/devicetree.cb @@ -5,6 +5,7 @@ chip northbridge/amd/amdk8/root_complex # Root complex end end device pci_domain 0 on # PCI domain + subsystemid 0x1043 0 inherit chip northbridge/amd/amdk8 # mc0 device pci 18.0 on # Northbridge # Devices on link 0, link 0 == LDT 0 diff --git a/src/mainboard/asus/m2v/Kconfig b/src/mainboard/asus/m2v/Kconfig index 757bc324c0..571b940bf7 100644 --- a/src/mainboard/asus/m2v/Kconfig +++ b/src/mainboard/asus/m2v/Kconfig @@ -75,10 +75,6 @@ config HT_CHAIN_UNITID_BASE hex default 0x0 -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1043 - config IRQ_SLOT_COUNT int default 14 diff --git a/src/mainboard/asus/m2v/devicetree.cb b/src/mainboard/asus/m2v/devicetree.cb index a08defba93..5138e252e4 100644 --- a/src/mainboard/asus/m2v/devicetree.cb +++ b/src/mainboard/asus/m2v/devicetree.cb @@ -5,6 +5,7 @@ chip northbridge/amd/amdk8/root_complex # Root complex end end device pci_domain 0 on # PCI domain + subsystemid 0x143 0 inherit chip northbridge/amd/amdk8 # mc0 device pci 18.0 on # Northbridge # Devices on link 0, link 0 == LDT 0 diff --git a/src/mainboard/asus/m4a78-em/Kconfig b/src/mainboard/asus/m4a78-em/Kconfig index 18542d3366..d036b212bf 100644 --- a/src/mainboard/asus/m4a78-em/Kconfig +++ b/src/mainboard/asus/m4a78-em/Kconfig @@ -77,14 +77,6 @@ config HEAP_SIZE hex default 0xc0000 -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x83f1 - -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1043 - config RAMBASE hex default 0x200000 diff --git a/src/mainboard/asus/m4a78-em/devicetree.cb b/src/mainboard/asus/m4a78-em/devicetree.cb index 914fde42fa..c463d71740 100644 --- a/src/mainboard/asus/m4a78-em/devicetree.cb +++ b/src/mainboard/asus/m4a78-em/devicetree.cb @@ -5,6 +5,7 @@ chip northbridge/amd/amdfam10/root_complex end end device pci_domain 0 on + subsystemid 0x1043 0x83f1 inherit chip northbridge/amd/amdfam10 device pci 18.0 on # northbridge chip southbridge/amd/rs780 diff --git a/src/mainboard/asus/m4a785-m/Kconfig b/src/mainboard/asus/m4a785-m/Kconfig index e41fcc2670..84cc06ceab 100644 --- a/src/mainboard/asus/m4a785-m/Kconfig +++ b/src/mainboard/asus/m4a785-m/Kconfig @@ -78,14 +78,6 @@ config HEAP_SIZE hex default 0xc0000 -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x83a2 - -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1043 - config RAMBASE hex default 0x200000 diff --git a/src/mainboard/asus/m4a785-m/devicetree.cb b/src/mainboard/asus/m4a785-m/devicetree.cb index 0736b72c08..e8764b1eba 100644 --- a/src/mainboard/asus/m4a785-m/devicetree.cb +++ b/src/mainboard/asus/m4a785-m/devicetree.cb @@ -5,6 +5,7 @@ chip northbridge/amd/amdfam10/root_complex end end device pci_domain 0 on + subsystemid 0x1043 0x83a2 inherit chip northbridge/amd/amdfam10 device pci 18.0 on # northbridge chip southbridge/amd/rs780 diff --git a/src/mainboard/broadcom/blast/Kconfig b/src/mainboard/broadcom/blast/Kconfig index 63a2975a15..4bad57ddd8 100644 --- a/src/mainboard/broadcom/blast/Kconfig +++ b/src/mainboard/broadcom/blast/Kconfig @@ -70,12 +70,4 @@ config IRQ_SLOT_COUNT int default 11 -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x161f - -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x3050 - endif # BOARD_BROADCOM_BLAST diff --git a/src/mainboard/broadcom/blast/devicetree.cb b/src/mainboard/broadcom/blast/devicetree.cb index c50ebc7834..6779a7a152 100644 --- a/src/mainboard/broadcom/blast/devicetree.cb +++ b/src/mainboard/broadcom/blast/devicetree.cb @@ -5,6 +5,7 @@ chip northbridge/amd/amdk8/root_complex end end device pci_domain 0 on + subsystemid 0x161f 0x3050 inherit chip northbridge/amd/amdk8 device pci 18.0 on # northbridge # devices on link 0 diff --git a/src/mainboard/dell/s1850/Kconfig b/src/mainboard/dell/s1850/Kconfig index 4185dfcb9c..381c9f6479 100644 --- a/src/mainboard/dell/s1850/Kconfig +++ b/src/mainboard/dell/s1850/Kconfig @@ -26,14 +26,6 @@ config MAINBOARD_PART_NUMBER string default "PowerEdge 1850" -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x5580 - -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x15d9 - config MAX_CPUS int default 4 diff --git a/src/mainboard/dell/s1850/devicetree.cb b/src/mainboard/dell/s1850/devicetree.cb index de8c90ba72..c56fd378ee 100644 --- a/src/mainboard/dell/s1850/devicetree.cb +++ b/src/mainboard/dell/s1850/devicetree.cb @@ -1,5 +1,6 @@ chip northbridge/intel/e7520 # mch device pci_domain 0 on + subsystemid 0x15d9 0x5580 inherit chip southbridge/intel/i82801ex # i82801er # USB ports device pci 1d.0 on end diff --git a/src/mainboard/gigabyte/ga_2761gxdk/Kconfig b/src/mainboard/gigabyte/ga_2761gxdk/Kconfig index 6571b318ed..d25db854f2 100644 --- a/src/mainboard/gigabyte/ga_2761gxdk/Kconfig +++ b/src/mainboard/gigabyte/ga_2761gxdk/Kconfig @@ -78,14 +78,6 @@ config SERIAL_CPU_INIT bool default n -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1039 - -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x1234 - config IRQ_SLOT_COUNT int default 11 diff --git a/src/mainboard/gigabyte/ga_2761gxdk/devicetree.cb b/src/mainboard/gigabyte/ga_2761gxdk/devicetree.cb index 62f9238b1c..e1aac4eb35 100644 --- a/src/mainboard/gigabyte/ga_2761gxdk/devicetree.cb +++ b/src/mainboard/gigabyte/ga_2761gxdk/devicetree.cb @@ -5,6 +5,7 @@ chip northbridge/amd/amdk8/root_complex end end device pci_domain 0 on + subsystemid 0x1039 0x1234 inherit chip northbridge/amd/amdk8 #mc0 device pci 18.0 on # devices on link 0, link 0 == LDT 0 diff --git a/src/mainboard/gigabyte/m57sli/Kconfig b/src/mainboard/gigabyte/m57sli/Kconfig index e36dccc8da..7250a9c6df 100644 --- a/src/mainboard/gigabyte/m57sli/Kconfig +++ b/src/mainboard/gigabyte/m57sli/Kconfig @@ -82,14 +82,6 @@ config SERIAL_CPU_INIT bool default n -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1022 - -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x2b80 - config IRQ_SLOT_COUNT int default 11 diff --git a/src/mainboard/gigabyte/m57sli/devicetree.cb b/src/mainboard/gigabyte/m57sli/devicetree.cb index 3bae560c68..2184de5050 100644 --- a/src/mainboard/gigabyte/m57sli/devicetree.cb +++ b/src/mainboard/gigabyte/m57sli/devicetree.cb @@ -5,6 +5,7 @@ chip northbridge/amd/amdk8/root_complex # Root complex end end device pci_domain 0 on # PCI domain + subsystemid 0x1022 0x2b80 inherit chip northbridge/amd/amdk8 # Northbridge / RAM controller device pci 18.0 on # Link 0 == LDT 0 chip southbridge/nvidia/mcp55 # Southbridge diff --git a/src/mainboard/gigabyte/ma785gmt/Kconfig b/src/mainboard/gigabyte/ma785gmt/Kconfig index 96b456cec6..fd511a8a83 100644 --- a/src/mainboard/gigabyte/ma785gmt/Kconfig +++ b/src/mainboard/gigabyte/ma785gmt/Kconfig @@ -79,14 +79,6 @@ config HEAP_SIZE hex default 0xc0000 -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x3060 - -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1022 - config RAMBASE hex default 0x200000 diff --git a/src/mainboard/gigabyte/ma785gmt/devicetree.cb b/src/mainboard/gigabyte/ma785gmt/devicetree.cb index dc7bd10a80..02e4bc888a 100644 --- a/src/mainboard/gigabyte/ma785gmt/devicetree.cb +++ b/src/mainboard/gigabyte/ma785gmt/devicetree.cb @@ -6,6 +6,7 @@ chip northbridge/amd/amdfam10/root_complex end end device pci_domain 0 on + subsystemid 0x1022 0x3060 inherit chip northbridge/amd/amdfam10 device pci 18.0 on # northbridge chip southbridge/amd/rs780 diff --git a/src/mainboard/gigabyte/ma78gm/Kconfig b/src/mainboard/gigabyte/ma78gm/Kconfig index cf3f6a27ad..56b819ef62 100644 --- a/src/mainboard/gigabyte/ma78gm/Kconfig +++ b/src/mainboard/gigabyte/ma78gm/Kconfig @@ -79,14 +79,6 @@ config HEAP_SIZE hex default 0xc0000 -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x3060 - -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1022 - config RAMBASE hex default 0x200000 diff --git a/src/mainboard/gigabyte/ma78gm/devicetree.cb b/src/mainboard/gigabyte/ma78gm/devicetree.cb index 59e1502dd7..38ff642c10 100644 --- a/src/mainboard/gigabyte/ma78gm/devicetree.cb +++ b/src/mainboard/gigabyte/ma78gm/devicetree.cb @@ -6,6 +6,7 @@ chip northbridge/amd/amdfam10/root_complex end end device pci_domain 0 on + subsystemid 0x3060 0x1022 inherit chip northbridge/amd/amdfam10 device pci 18.0 on # northbridge chip southbridge/amd/rs780 diff --git a/src/mainboard/hp/dl145_g1/Kconfig b/src/mainboard/hp/dl145_g1/Kconfig index bb4a33dae3..eb90b07032 100644 --- a/src/mainboard/hp/dl145_g1/Kconfig +++ b/src/mainboard/hp/dl145_g1/Kconfig @@ -34,14 +34,6 @@ config MAINBOARD_PART_NUMBER string default "ProLiant DL145 G1" -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1022 - -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x7460 - config MAX_CPUS int default 4 diff --git a/src/mainboard/hp/dl145_g1/devicetree.cb b/src/mainboard/hp/dl145_g1/devicetree.cb index bd37862bcf..3237723a53 100644 --- a/src/mainboard/hp/dl145_g1/devicetree.cb +++ b/src/mainboard/hp/dl145_g1/devicetree.cb @@ -5,6 +5,7 @@ chip northbridge/amd/amdk8/root_complex end end device pci_domain 0 on + subsystemid 0x1022 0x7460 inherit chip northbridge/amd/amdk8 device pci 18.0 on end # link 0 device pci 18.0 on end # link 1 diff --git a/src/mainboard/iei/kino-780am2-fam10/Kconfig b/src/mainboard/iei/kino-780am2-fam10/Kconfig index e662fe4227..8fb1950b8d 100644 --- a/src/mainboard/iei/kino-780am2-fam10/Kconfig +++ b/src/mainboard/iei/kino-780am2-fam10/Kconfig @@ -79,14 +79,6 @@ config HEAP_SIZE hex default 0xc0000 -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x0000 - -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x0000 - config RAMBASE hex default 0x200000 diff --git a/src/mainboard/intel/Kconfig b/src/mainboard/intel/Kconfig index 612b1c1753..ff8d63b1d8 100644 --- a/src/mainboard/intel/Kconfig +++ b/src/mainboard/intel/Kconfig @@ -32,8 +32,4 @@ config MAINBOARD_VENDOR string default "Intel" -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x8086 - endif # VENDOR_INTEL diff --git a/src/mainboard/intel/d945gclf/Kconfig b/src/mainboard/intel/d945gclf/Kconfig index 04643bbbba..ff8c638f0a 100644 --- a/src/mainboard/intel/d945gclf/Kconfig +++ b/src/mainboard/intel/d945gclf/Kconfig @@ -49,10 +49,6 @@ config MAINBOARD_PART_NUMBER string default "D945GCLF" -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x464C - config MMCONF_BASE_ADDRESS hex default 0xf0000000 diff --git a/src/mainboard/intel/d945gclf/devicetree.cb b/src/mainboard/intel/d945gclf/devicetree.cb index c808cdc763..a58d99e61e 100644 --- a/src/mainboard/intel/d945gclf/devicetree.cb +++ b/src/mainboard/intel/d945gclf/devicetree.cb @@ -26,6 +26,7 @@ chip northbridge/intel/i945 end device pci_domain 0 on + subsystemid 0x8086 0x464c inherit device pci 00.0 on end # host bridge device pci 01.0 off end # i945 PCIe root port device pci 02.0 on end # vga controller diff --git a/src/mainboard/intel/jarrell/Kconfig b/src/mainboard/intel/jarrell/Kconfig index 2ac8ea3c13..494086ebb6 100644 --- a/src/mainboard/intel/jarrell/Kconfig +++ b/src/mainboard/intel/jarrell/Kconfig @@ -35,14 +35,6 @@ config IRQ_SLOT_COUNT int default 18 -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x8086 - -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x1079 - config DIMM_MAP_LOGICAL hex default 0x0124 diff --git a/src/mainboard/intel/jarrell/devicetree.cb b/src/mainboard/intel/jarrell/devicetree.cb index a187d23041..fb32a089e3 100644 --- a/src/mainboard/intel/jarrell/devicetree.cb +++ b/src/mainboard/intel/jarrell/devicetree.cb @@ -1,5 +1,6 @@ chip northbridge/intel/e7520 device pci_domain 0 on + subsystemid 0x8086 0x1079 inherit device pci 00.0 on end device pci 00.1 on end device pci 01.0 on end diff --git a/src/mainboard/intel/mtarvon/Kconfig b/src/mainboard/intel/mtarvon/Kconfig index 76dec5eb37..76477b0d38 100644 --- a/src/mainboard/intel/mtarvon/Kconfig +++ b/src/mainboard/intel/mtarvon/Kconfig @@ -25,14 +25,6 @@ config IRQ_SLOT_COUNT int default 1 -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x8086 - -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x2680 - config DCACHE_RAM_BASE hex default 0xffdf8000 diff --git a/src/mainboard/intel/mtarvon/devicetree.cb b/src/mainboard/intel/mtarvon/devicetree.cb index 8585b54e17..cd7df2d1d2 100644 --- a/src/mainboard/intel/mtarvon/devicetree.cb +++ b/src/mainboard/intel/mtarvon/devicetree.cb @@ -1,5 +1,6 @@ chip northbridge/intel/i3100 device pci_domain 0 on + subsystemid 0x8086 0x2680 inherit device pci 00.0 on end # IMCH device pci 00.1 on end # IMCH error status device pci 01.0 on end # IMCH EDMA engine diff --git a/src/mainboard/intel/truxton/Kconfig b/src/mainboard/intel/truxton/Kconfig index 1ba71372db..5f7de086e7 100644 --- a/src/mainboard/intel/truxton/Kconfig +++ b/src/mainboard/intel/truxton/Kconfig @@ -27,14 +27,6 @@ config IRQ_SLOT_COUNT int default 1 -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x8086 - -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x2680 - config MAX_CPUS int default 4 diff --git a/src/mainboard/intel/truxton/devicetree.cb b/src/mainboard/intel/truxton/devicetree.cb index 7563f028f9..486601a420 100644 --- a/src/mainboard/intel/truxton/devicetree.cb +++ b/src/mainboard/intel/truxton/devicetree.cb @@ -1,5 +1,6 @@ chip northbridge/intel/i3100 device pci_domain 0 on + subsystemid 0x8086 0x2680 inherit device pci 00.0 on end # IMCH device pci 00.1 on end # IMCH error status device pci 01.0 on end # IMCH EDMA engine diff --git a/src/mainboard/intel/xe7501devkit/Kconfig b/src/mainboard/intel/xe7501devkit/Kconfig index 35a1cd1f69..916342376f 100644 --- a/src/mainboard/intel/xe7501devkit/Kconfig +++ b/src/mainboard/intel/xe7501devkit/Kconfig @@ -37,12 +37,4 @@ config MAX_PHYSICAL_CPUS int default 2 -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x8086 - -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x2480 - endif # BOARD_INTEL_XE7501DEVKIT diff --git a/src/mainboard/intel/xe7501devkit/devicetree.cb b/src/mainboard/intel/xe7501devkit/devicetree.cb index 327545785f..18ee64e0db 100644 --- a/src/mainboard/intel/xe7501devkit/devicetree.cb +++ b/src/mainboard/intel/xe7501devkit/devicetree.cb @@ -1,5 +1,6 @@ chip northbridge/intel/e7501 device pci_domain 0 on + subsystemid 0x8086 0x2480 inherit device pci 0.0 on end # Chipset host controller device pci 0.1 on end # Host RASUM controller device pci 2.0 on # Hub interface B diff --git a/src/mainboard/iwill/dk8_htx/Kconfig b/src/mainboard/iwill/dk8_htx/Kconfig index 414fa457d2..e58fe4e942 100644 --- a/src/mainboard/iwill/dk8_htx/Kconfig +++ b/src/mainboard/iwill/dk8_htx/Kconfig @@ -63,14 +63,6 @@ config IRQ_SLOT_COUNT int default 11 -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1022 - -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x2b80 - config ACPI_SSDTX_NUM int default 5 diff --git a/src/mainboard/iwill/dk8_htx/devicetree.cb b/src/mainboard/iwill/dk8_htx/devicetree.cb index e1cb939552..d0cff02273 100644 --- a/src/mainboard/iwill/dk8_htx/devicetree.cb +++ b/src/mainboard/iwill/dk8_htx/devicetree.cb @@ -5,6 +5,7 @@ chip northbridge/amd/amdk8/root_complex end end device pci_domain 0 on + subsystemid 0x1022 0x2b80 inherit chip northbridge/amd/amdk8 device pci 18.0 on end device pci 18.0 on end diff --git a/src/mainboard/iwill/dk8s2/Kconfig b/src/mainboard/iwill/dk8s2/Kconfig index d144b7d8a6..78d0637a54 100644 --- a/src/mainboard/iwill/dk8s2/Kconfig +++ b/src/mainboard/iwill/dk8s2/Kconfig @@ -60,12 +60,4 @@ config IRQ_SLOT_COUNT int default 12 -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x161f - -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x3016 - endif # BOARD_IWILL_DK8S2 diff --git a/src/mainboard/iwill/dk8s2/devicetree.cb b/src/mainboard/iwill/dk8s2/devicetree.cb index 8185b5dc1a..35b230735f 100644 --- a/src/mainboard/iwill/dk8s2/devicetree.cb +++ b/src/mainboard/iwill/dk8s2/devicetree.cb @@ -5,6 +5,7 @@ chip northbridge/amd/amdk8/root_complex end end device pci_domain 0 on + subsystemid 0x161f 0x3016 inherit chip northbridge/amd/amdk8 device pci 18.0 on # LDT 0 chip southbridge/amd/amd8131 diff --git a/src/mainboard/jetway/pa78vm5/Kconfig b/src/mainboard/jetway/pa78vm5/Kconfig index 10fab734a5..62adb537e9 100644 --- a/src/mainboard/jetway/pa78vm5/Kconfig +++ b/src/mainboard/jetway/pa78vm5/Kconfig @@ -79,14 +79,6 @@ config HEAP_SIZE hex default 0xc0000 -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x3060 - -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1022 - config RAMBASE hex default 0x200000 diff --git a/src/mainboard/jetway/pa78vm5/devicetree.cb b/src/mainboard/jetway/pa78vm5/devicetree.cb index 73f6ac25cd..6913d79f9f 100644 --- a/src/mainboard/jetway/pa78vm5/devicetree.cb +++ b/src/mainboard/jetway/pa78vm5/devicetree.cb @@ -6,6 +6,7 @@ chip northbridge/amd/amdfam10/root_complex end end device pci_domain 0 on + subsystemid 0x1022 0x3060 inherit chip northbridge/amd/amdfam10 device pci 18.0 on # northbridge chip southbridge/amd/rs780 diff --git a/src/mainboard/kontron/kt690/Kconfig b/src/mainboard/kontron/kt690/Kconfig index 891de59345..91d6b67ef2 100644 --- a/src/mainboard/kontron/kt690/Kconfig +++ b/src/mainboard/kontron/kt690/Kconfig @@ -28,14 +28,6 @@ config MAINBOARD_DIR string default kontron/kt690 -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1488 - -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x6900 - config APIC_ID_OFFSET hex default 0x0 diff --git a/src/mainboard/kontron/kt690/devicetree.cb b/src/mainboard/kontron/kt690/devicetree.cb index d509050189..68741aeaa2 100644 --- a/src/mainboard/kontron/kt690/devicetree.cb +++ b/src/mainboard/kontron/kt690/devicetree.cb @@ -15,6 +15,7 @@ chip northbridge/amd/amdk8/root_complex end end device pci_domain 0 on + subsystemid 0x1488 0x6900 inherit chip northbridge/amd/amdk8 device pci 18.0 on # southbridge chip southbridge/amd/rs690 diff --git a/src/mainboard/lenovo/x60/devicetree.cb b/src/mainboard/lenovo/x60/devicetree.cb index 40e16b3d02..2817255e82 100644 --- a/src/mainboard/lenovo/x60/devicetree.cb +++ b/src/mainboard/lenovo/x60/devicetree.cb @@ -22,17 +22,23 @@ chip northbridge/intel/i945 - device lapic_cluster 0 on - chip cpu/intel/socket_mFCPGA478 - device lapic 0 on end - end - end - - device pci_domain 0 on - device pci 00.0 on end # host bridge - device pci 02.0 on end # vga controller - device pci 02.1 on end # display controller - chip southbridge/intel/i82801gx + device lapic_cluster 0 on + chip cpu/intel/socket_mFCPGA478 + device lapic 0 on end + end + end + + device pci_domain 0 on + device pci 00.0 on # Host bridge + subsystemid 0x17aa 0x2017 + end + device pci 02.0 on # VGA controller + subsystemid 0x17aa 0x201a + end + device pci 02.1 on # display controller + subsystemid 0x17aa 0x201a + end + chip southbridge/intel/i82801gx register "pirqa_routing" = "0x0b" register "pirqb_routing" = "0x0b" register "pirqc_routing" = "0x0b" @@ -46,23 +52,36 @@ chip northbridge/intel/i945 # 0 No effect (default) # 1 SMI# (if corresponding ALT_GPI_SMI_EN bit is also set) # 2 SCI (if corresponding GPIO_EN bit is also set) - register "gpi13_routing" = "2" - register "gpi12_routing" = "2" - register "gpi8_routing" = "2" + register "gpi13_routing" = "2" + register "gpi12_routing" = "2" + register "gpi8_routing" = "2" - register "sata_ahci" = "0x0" + register "sata_ahci" = "0x0" register "gpe0_en" = "0x11000006" - device pci 1b.0 on end # Audio Controller + device pci 1b.0 on # Audio Cnotroller + subsystemid 0x17aa 0x2010 + end device pci 1c.0 on end # Ethernet device pci 1c.1 on end # Atheros WLAN - device pci 1d.0 on end # USB UHCI - device pci 1d.1 on end # USB UHCI - device pci 1d.2 on end # USB UHCI - device pci 1d.3 on end # USB UHCI - device pci 1d.7 on end # USB2 EHCI + device pci 1d.0 on # USB UHCI + subsystemid 0x17aa 0x200a + end + device pci 1d.1 on # USB UHCI + subsystemid 0x17aa 0x200a + end + device pci 1d.2 on # USB UHCI + subsystemid 0x17aa 0x200a + end + device pci 1d.3 on # USB UHCI + subsystemid 0x17aa 0x200a + end + device pci 1d.7 on # USB2 EHCI + subsystemid 0x17aa 0x200b + end device pci 1f.0 on # PCI-LPC bridge + subsystemid 0x17aa 0x2009 chip ec/lenovo/pmh7 device pnp ff.1 on # dummy end @@ -120,9 +139,15 @@ chip northbridge/intel/i945 end end end - device pci 1f.1 off end # IDE - device pci 1f.2 on end # SATA - device pci 1f.3 on end # SMBus + device pci 1f.1 off # IDE + subsystemid 0x17aa 0x200c + end + device pci 1f.2 on # SATA + subsystemid 0x17aa 0x200d + end + device pci 1f.3 on # SMBUS + subsystemid 0x17aa 0x200f + end end chip southbridge/ricoh/rl5c476 end diff --git a/src/mainboard/msi/Kconfig b/src/mainboard/msi/Kconfig index c2f1595877..3d0de4a5e8 100644 --- a/src/mainboard/msi/Kconfig +++ b/src/mainboard/msi/Kconfig @@ -56,8 +56,4 @@ config MAINBOARD_VENDOR string default "MSI" -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1462 - endif # VENDOR_MSI diff --git a/src/mainboard/msi/ms7135/Kconfig b/src/mainboard/msi/ms7135/Kconfig index d8581f731c..0611be2ba9 100644 --- a/src/mainboard/msi/ms7135/Kconfig +++ b/src/mainboard/msi/ms7135/Kconfig @@ -34,10 +34,6 @@ config MAINBOARD_PART_NUMBER string default "MS-7135" -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x7135 - config MAX_CPUS int default 2 diff --git a/src/mainboard/msi/ms7135/devicetree.cb b/src/mainboard/msi/ms7135/devicetree.cb index 14c6bad1d3..54e5d5e599 100644 --- a/src/mainboard/msi/ms7135/devicetree.cb +++ b/src/mainboard/msi/ms7135/devicetree.cb @@ -6,6 +6,7 @@ chip northbridge/amd/amdk8/root_complex # Root complex end device pci_domain 0 on # PCI domain + subsystemid 0x1462 0x7135 inherit chip northbridge/amd/amdk8 # Northbridge / RAM controller device pci 18.0 on # Link 0 == LDT 0 chip southbridge/nvidia/ck804 # Southbridge diff --git a/src/mainboard/msi/ms7260/Kconfig b/src/mainboard/msi/ms7260/Kconfig index aec6af50b7..be425ecac8 100644 --- a/src/mainboard/msi/ms7260/Kconfig +++ b/src/mainboard/msi/ms7260/Kconfig @@ -80,14 +80,6 @@ config SERIAL_CPU_INIT bool default n -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1462 - -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x7260 - config IRQ_SLOT_COUNT int default 11 diff --git a/src/mainboard/msi/ms7260/devicetree.cb b/src/mainboard/msi/ms7260/devicetree.cb index 552224d2c3..47d5381b5c 100644 --- a/src/mainboard/msi/ms7260/devicetree.cb +++ b/src/mainboard/msi/ms7260/devicetree.cb @@ -5,6 +5,7 @@ chip northbridge/amd/amdk8/root_complex # Root complex end end device pci_domain 0 on # PCI domain + subsystemid 0x1462 0x7260 inherit chip northbridge/amd/amdk8 # Northbridge / RAM controller device pci 18.0 on # Link 0 == LDT 0 chip southbridge/nvidia/mcp55 # Southbridge diff --git a/src/mainboard/msi/ms9185/Kconfig b/src/mainboard/msi/ms9185/Kconfig index 5e28353007..1464acd5a2 100644 --- a/src/mainboard/msi/ms9185/Kconfig +++ b/src/mainboard/msi/ms9185/Kconfig @@ -71,12 +71,4 @@ config IRQ_SLOT_COUNT int default 11 -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1022 - -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x2b80 - endif # BOARD_MSI_MS9185 diff --git a/src/mainboard/msi/ms9185/devicetree.cb b/src/mainboard/msi/ms9185/devicetree.cb index fc566e23d3..9576225e91 100644 --- a/src/mainboard/msi/ms9185/devicetree.cb +++ b/src/mainboard/msi/ms9185/devicetree.cb @@ -5,6 +5,7 @@ chip northbridge/amd/amdk8/root_complex end end device pci_domain 0 on + subsystemid 0x1022 0x2b80 inherit chip northbridge/amd/amdk8 device pci 18.0 on end device pci 18.0 on end diff --git a/src/mainboard/msi/ms9282/Kconfig b/src/mainboard/msi/ms9282/Kconfig index f2ea65ad4b..3ccc3f9756 100644 --- a/src/mainboard/msi/ms9282/Kconfig +++ b/src/mainboard/msi/ms9282/Kconfig @@ -72,14 +72,6 @@ config SERIAL_CPU_INIT bool default n -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1462 - -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x9282 - config IRQ_SLOT_COUNT int default 11 diff --git a/src/mainboard/msi/ms9282/devicetree.cb b/src/mainboard/msi/ms9282/devicetree.cb index 74ea1832ee..b52e7ed650 100644 --- a/src/mainboard/msi/ms9282/devicetree.cb +++ b/src/mainboard/msi/ms9282/devicetree.cb @@ -5,6 +5,7 @@ chip northbridge/amd/amdk8/root_complex # Root complex end end device pci_domain 0 on # PCI domain + subsystemid 0x1462 0x9282 inherit chip northbridge/amd/amdk8 # Northbridge / RAM controller device pci 18.0 on # Link 0 == LDT 0 chip southbridge/nvidia/mcp55 # Southbridge diff --git a/src/mainboard/msi/ms9652_fam10/Kconfig b/src/mainboard/msi/ms9652_fam10/Kconfig index d8025d789e..948d320735 100644 --- a/src/mainboard/msi/ms9652_fam10/Kconfig +++ b/src/mainboard/msi/ms9652_fam10/Kconfig @@ -87,14 +87,6 @@ config MAINBOARD_PART_NUMBER string default "MS-9652" -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1462 - -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x9652 - config RAMBASE hex default 0x200000 diff --git a/src/mainboard/msi/ms9652_fam10/devicetree.cb b/src/mainboard/msi/ms9652_fam10/devicetree.cb index c3e4e4f16d..0e9a3ffe3e 100644 --- a/src/mainboard/msi/ms9652_fam10/devicetree.cb +++ b/src/mainboard/msi/ms9652_fam10/devicetree.cb @@ -28,6 +28,7 @@ chip northbridge/amd/amdfam10/root_complex # Root complex end end device pci_domain 0 on # PCI domain + subsystemid 0x1462 0x9652 inherit chip northbridge/amd/amdfam10 # Northbridge / RAM controller device pci 18.0 on # Link 0 chip southbridge/nvidia/mcp55 # Southbridge diff --git a/src/mainboard/newisys/khepri/Kconfig b/src/mainboard/newisys/khepri/Kconfig index d11d6eaf7d..fc4c22387e 100644 --- a/src/mainboard/newisys/khepri/Kconfig +++ b/src/mainboard/newisys/khepri/Kconfig @@ -69,12 +69,4 @@ config IRQ_SLOT_COUNT int default 9 -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x17c2 - -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x10 - endif # BOARD_NEWISYS_KHEPRI diff --git a/src/mainboard/newisys/khepri/devicetree.cb b/src/mainboard/newisys/khepri/devicetree.cb index a56a010b33..9cdbc9c661 100644 --- a/src/mainboard/newisys/khepri/devicetree.cb +++ b/src/mainboard/newisys/khepri/devicetree.cb @@ -6,6 +6,7 @@ chip northbridge/amd/amdk8/root_complex end device pci_domain 0 on + subsystemid 0x17c2 0x0010 inherit chip northbridge/amd/amdk8 device pci 18.0 on end # LDT 0 device pci 18.0 on # LDT 1 diff --git a/src/mainboard/nvidia/l1_2pvv/Kconfig b/src/mainboard/nvidia/l1_2pvv/Kconfig index 80f5e3458b..bfec32343f 100644 --- a/src/mainboard/nvidia/l1_2pvv/Kconfig +++ b/src/mainboard/nvidia/l1_2pvv/Kconfig @@ -84,14 +84,6 @@ config SERIAL_CPU_INIT bool default n -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1022 - -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x2b80 - config IRQ_SLOT_COUNT int default 11 diff --git a/src/mainboard/nvidia/l1_2pvv/devicetree.cb b/src/mainboard/nvidia/l1_2pvv/devicetree.cb index 1340cb38f7..9a807107cb 100644 --- a/src/mainboard/nvidia/l1_2pvv/devicetree.cb +++ b/src/mainboard/nvidia/l1_2pvv/devicetree.cb @@ -5,6 +5,7 @@ chip northbridge/amd/amdk8/root_complex # Root complex end end device pci_domain 0 on # PCI domain + subsystemid 0x1022 0x2b80 inherit chip northbridge/amd/amdk8 # Northbridge / RAM controller device pci 18.0 on # Link 0 == LDT 0 chip southbridge/nvidia/mcp55 # Southbridge diff --git a/src/mainboard/roda/Kconfig b/src/mainboard/roda/Kconfig index d2f1e9500d..ba4b6ec13a 100644 --- a/src/mainboard/roda/Kconfig +++ b/src/mainboard/roda/Kconfig @@ -14,8 +14,4 @@ config MAINBOARD_VENDOR string default "Roda" -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x4352 - endif # VENDOR_RODA diff --git a/src/mainboard/roda/rk886ex/Kconfig b/src/mainboard/roda/rk886ex/Kconfig index 647511a3d3..340ee98fe4 100644 --- a/src/mainboard/roda/rk886ex/Kconfig +++ b/src/mainboard/roda/rk886ex/Kconfig @@ -46,10 +46,6 @@ config MAX_PHYSICAL_CPUS int default 2 -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x6886 - config MAXIMUM_SUPPORTED_FREQUENCY int default 400 diff --git a/src/mainboard/roda/rk886ex/devicetree.cb b/src/mainboard/roda/rk886ex/devicetree.cb index a713331172..5de2cc32ce 100644 --- a/src/mainboard/roda/rk886ex/devicetree.cb +++ b/src/mainboard/roda/rk886ex/devicetree.cb @@ -28,6 +28,7 @@ chip northbridge/intel/i945 end device pci_domain 0 on + subsystemid 0x4352 0x0686 inherit device pci 00.0 on end # host bridge # auto detection: #device pci 01.0 off end # i945 PCIe root port diff --git a/src/mainboard/sunw/ultra40/Kconfig b/src/mainboard/sunw/ultra40/Kconfig index 3b8544b1b0..81a6608208 100644 --- a/src/mainboard/sunw/ultra40/Kconfig +++ b/src/mainboard/sunw/ultra40/Kconfig @@ -75,12 +75,4 @@ config IRQ_SLOT_COUNT int default 11 -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x108e - -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x40 - endif # BOARD_SUNW_ULTRA40 diff --git a/src/mainboard/sunw/ultra40/devicetree.cb b/src/mainboard/sunw/ultra40/devicetree.cb index 059724ee37..f355200ce6 100644 --- a/src/mainboard/sunw/ultra40/devicetree.cb +++ b/src/mainboard/sunw/ultra40/devicetree.cb @@ -5,6 +5,7 @@ chip northbridge/amd/amdk8/root_complex # Root complex end end device pci_domain 0 on # PCI domain + subsystemid 0x108e 0x0040 inherit chip northbridge/amd/amdk8 # Northbridge / RAM controller device pci 18.0 on end device pci 18.0 on # Link 0 == LDT 0 diff --git a/src/mainboard/supermicro/Kconfig b/src/mainboard/supermicro/Kconfig index 5ac7ddac36..8e5694cf1b 100644 --- a/src/mainboard/supermicro/Kconfig +++ b/src/mainboard/supermicro/Kconfig @@ -38,8 +38,4 @@ config MAINBOARD_VENDOR string default "Supermicro" -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x15d9 - endif # VENDOR_SUPERMICRO diff --git a/src/mainboard/supermicro/h8dme/Kconfig b/src/mainboard/supermicro/h8dme/Kconfig index 0259b4af0c..ce49a4781e 100644 --- a/src/mainboard/supermicro/h8dme/Kconfig +++ b/src/mainboard/supermicro/h8dme/Kconfig @@ -81,12 +81,4 @@ config IRQ_SLOT_COUNT int default 11 -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x15d9 - -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x1511 - endif # BOARD_SUPERMICRO_H8DME diff --git a/src/mainboard/supermicro/h8dme/devicetree.cb b/src/mainboard/supermicro/h8dme/devicetree.cb index df40dc34e4..73a43e8271 100644 --- a/src/mainboard/supermicro/h8dme/devicetree.cb +++ b/src/mainboard/supermicro/h8dme/devicetree.cb @@ -5,6 +5,7 @@ chip northbridge/amd/amdk8/root_complex # Root complex end end device pci_domain 0 on # PCI domain + subsystemid 0x15d9 0x1511 inherit chip northbridge/amd/amdk8 # Northbridge / RAM controller device pci 18.0 on end device pci 18.0 on end diff --git a/src/mainboard/supermicro/h8dmr/Kconfig b/src/mainboard/supermicro/h8dmr/Kconfig index 81517bed1f..5527319ce8 100644 --- a/src/mainboard/supermicro/h8dmr/Kconfig +++ b/src/mainboard/supermicro/h8dmr/Kconfig @@ -80,12 +80,4 @@ config IRQ_SLOT_COUNT int default 11 -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x15d9 - -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x1511 - endif # BOARD_SUPERMICRO_H8DMR diff --git a/src/mainboard/supermicro/h8dmr/devicetree.cb b/src/mainboard/supermicro/h8dmr/devicetree.cb index 1dfd32ac5c..6c96ac0dea 100644 --- a/src/mainboard/supermicro/h8dmr/devicetree.cb +++ b/src/mainboard/supermicro/h8dmr/devicetree.cb @@ -5,6 +5,7 @@ chip northbridge/amd/amdk8/root_complex # Root complex end end device pci_domain 0 on # PCI domain + subsystemid 0x15d9 0x1511 inherit chip northbridge/amd/amdk8 # Northbridge / RAM controller device pci 18.0 on end device pci 18.0 on end diff --git a/src/mainboard/supermicro/h8dmr_fam10/Kconfig b/src/mainboard/supermicro/h8dmr_fam10/Kconfig index 4b31bf30a7..195bc5cf41 100644 --- a/src/mainboard/supermicro/h8dmr_fam10/Kconfig +++ b/src/mainboard/supermicro/h8dmr_fam10/Kconfig @@ -100,8 +100,4 @@ config SERIAL_CPU_INIT bool default n -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x1511 - endif # BOARD_SUPERMICRO_H8DMR_FAM10 diff --git a/src/mainboard/supermicro/h8dmr_fam10/devicetree.cb b/src/mainboard/supermicro/h8dmr_fam10/devicetree.cb index da82b17376..6c4443f902 100644 --- a/src/mainboard/supermicro/h8dmr_fam10/devicetree.cb +++ b/src/mainboard/supermicro/h8dmr_fam10/devicetree.cb @@ -5,6 +5,7 @@ chip northbridge/amd/amdfam10/root_complex # Root complex end end device pci_domain 0 on # PCI domain + subsystemid 0x15d9 0x1511 inherit chip northbridge/amd/amdfam10 # Northbridge / RAM controller device pci 18.0 on end device pci 18.0 on end diff --git a/src/mainboard/supermicro/h8qme_fam10/Kconfig b/src/mainboard/supermicro/h8qme_fam10/Kconfig index bd0f550d17..1d4f8e76cc 100644 --- a/src/mainboard/supermicro/h8qme_fam10/Kconfig +++ b/src/mainboard/supermicro/h8qme_fam10/Kconfig @@ -99,10 +99,6 @@ config SERIAL_CPU_INIT bool default y -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x1511 - config STACK_SIZE hex default 0x10000 diff --git a/src/mainboard/supermicro/h8qme_fam10/devicetree.cb b/src/mainboard/supermicro/h8qme_fam10/devicetree.cb index 990afa4c64..56ba7b5395 100644 --- a/src/mainboard/supermicro/h8qme_fam10/devicetree.cb +++ b/src/mainboard/supermicro/h8qme_fam10/devicetree.cb @@ -5,6 +5,7 @@ chip northbridge/amd/amdfam10/root_complex # Root complex end end device pci_domain 0 on # PCI domain + subsystemid 0x15d9 0x1511 inherit chip northbridge/amd/amdfam10 # Northbridge / RAM controller device pci 18.0 on end device pci 18.0 on end diff --git a/src/mainboard/supermicro/x6dai_g/Kconfig b/src/mainboard/supermicro/x6dai_g/Kconfig index 8b1cf5a274..bac1008a1a 100644 --- a/src/mainboard/supermicro/x6dai_g/Kconfig +++ b/src/mainboard/supermicro/x6dai_g/Kconfig @@ -23,14 +23,6 @@ config MAINBOARD_PART_NUMBER string default "X6DAi-G" -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x15d9 - -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x6780 - config MAX_CPUS int default 4 diff --git a/src/mainboard/supermicro/x6dai_g/devicetree.cb b/src/mainboard/supermicro/x6dai_g/devicetree.cb index c8ce779ca2..e6201a811e 100644 --- a/src/mainboard/supermicro/x6dai_g/devicetree.cb +++ b/src/mainboard/supermicro/x6dai_g/devicetree.cb @@ -1,5 +1,6 @@ chip northbridge/intel/e7525 # mch device pci_domain 0 on + subsystemid 0x15d9 0x6780 inherit chip southbridge/intel/esb6300 # esb6300 register "pirq_a_d" = "0x0b0a0a05" register "pirq_e_h" = "0x0a0b0c80" diff --git a/src/mainboard/supermicro/x6dhe_g/Kconfig b/src/mainboard/supermicro/x6dhe_g/Kconfig index 8771d9ec58..e8466be8a3 100644 --- a/src/mainboard/supermicro/x6dhe_g/Kconfig +++ b/src/mainboard/supermicro/x6dhe_g/Kconfig @@ -25,14 +25,6 @@ config MAINBOARD_PART_NUMBER string default "X6DHE-G" -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x15d9 - -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x6080 - config MAX_CPUS int default 4 diff --git a/src/mainboard/supermicro/x6dhe_g/devicetree.cb b/src/mainboard/supermicro/x6dhe_g/devicetree.cb index 6dd6b17d66..08c0751c00 100644 --- a/src/mainboard/supermicro/x6dhe_g/devicetree.cb +++ b/src/mainboard/supermicro/x6dhe_g/devicetree.cb @@ -6,6 +6,7 @@ chip northbridge/intel/e7520 # MCH device pnp 00.3 off end end device pci_domain 0 on + subsystemid 0x15d9 0x6080 inherit chip southbridge/intel/esb6300 # ESB6300 register "pirq_a_d" = "0x0b070a05" register "pirq_e_h" = "0x0a808080" diff --git a/src/mainboard/supermicro/x6dhe_g2/Kconfig b/src/mainboard/supermicro/x6dhe_g2/Kconfig index 96549d6154..e9d404191e 100644 --- a/src/mainboard/supermicro/x6dhe_g2/Kconfig +++ b/src/mainboard/supermicro/x6dhe_g2/Kconfig @@ -26,14 +26,6 @@ config MAINBOARD_PART_NUMBER string default "X6DHE-G2" -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x15d9 - -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x6080 - config MAX_CPUS int default 4 diff --git a/src/mainboard/supermicro/x6dhe_g2/devicetree.cb b/src/mainboard/supermicro/x6dhe_g2/devicetree.cb index 04110b0eb7..ecfe0a00a3 100644 --- a/src/mainboard/supermicro/x6dhe_g2/devicetree.cb +++ b/src/mainboard/supermicro/x6dhe_g2/devicetree.cb @@ -6,6 +6,7 @@ chip northbridge/intel/e7520 # MCH device pnp 00.3 off end end device pci_domain 0 on + subsystemid 0x15d9 0x6080 inherit chip southbridge/intel/i82801ex # ICH5R register "pirq_a_d" = "0x0b070a05" register "pirq_e_h" = "0x0a808080" diff --git a/src/mainboard/supermicro/x6dhr_ig/Kconfig b/src/mainboard/supermicro/x6dhr_ig/Kconfig index d1163d74b7..a146e77a6c 100644 --- a/src/mainboard/supermicro/x6dhr_ig/Kconfig +++ b/src/mainboard/supermicro/x6dhr_ig/Kconfig @@ -25,14 +25,6 @@ config MAINBOARD_PART_NUMBER string default "X6DHR-iG" -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x15d9 - -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x5580 - config MAX_CPUS int default 4 diff --git a/src/mainboard/supermicro/x6dhr_ig/devicetree.cb b/src/mainboard/supermicro/x6dhr_ig/devicetree.cb index df778ed61b..6ada3b1341 100644 --- a/src/mainboard/supermicro/x6dhr_ig/devicetree.cb +++ b/src/mainboard/supermicro/x6dhr_ig/devicetree.cb @@ -1,5 +1,6 @@ chip northbridge/intel/e7520 # mch device pci_domain 0 on + subsystemid 0x15d9 0x5580 inherit chip southbridge/intel/i82801ex # i82801er # USB ports device pci 1d.0 on end diff --git a/src/mainboard/supermicro/x6dhr_ig2/Kconfig b/src/mainboard/supermicro/x6dhr_ig2/Kconfig index 494b0ed43c..6196e2ab71 100644 --- a/src/mainboard/supermicro/x6dhr_ig2/Kconfig +++ b/src/mainboard/supermicro/x6dhr_ig2/Kconfig @@ -25,14 +25,6 @@ config MAINBOARD_PART_NUMBER string default "X6DHR-iG2" -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x15d9 - -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x5580 - config MAX_CPUS int default 4 diff --git a/src/mainboard/supermicro/x6dhr_ig2/devicetree.cb b/src/mainboard/supermicro/x6dhr_ig2/devicetree.cb index 77c9e9d7cb..3d9b644fd9 100644 --- a/src/mainboard/supermicro/x6dhr_ig2/devicetree.cb +++ b/src/mainboard/supermicro/x6dhr_ig2/devicetree.cb @@ -1,5 +1,6 @@ chip northbridge/intel/e7520 # mch device pci_domain 0 on + subsystemid 0x15d9 0x5580 inherit chip southbridge/intel/i82801ex # i82801er # USB ports device pci 1d.0 on end diff --git a/src/mainboard/technexion/tim5690/Kconfig b/src/mainboard/technexion/tim5690/Kconfig index d855df12f2..21cfa7b1d0 100644 --- a/src/mainboard/technexion/tim5690/Kconfig +++ b/src/mainboard/technexion/tim5690/Kconfig @@ -60,14 +60,6 @@ config IRQ_SLOT_COUNT int default 11 -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1022 - -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x3050 - config STACK_SIZE hex default 0x2000 diff --git a/src/mainboard/technexion/tim5690/devicetree.cb b/src/mainboard/technexion/tim5690/devicetree.cb index c129a2d9c6..148a4ab469 100644 --- a/src/mainboard/technexion/tim5690/devicetree.cb +++ b/src/mainboard/technexion/tim5690/devicetree.cb @@ -15,6 +15,7 @@ chip northbridge/amd/amdk8/root_complex end end device pci_domain 0 on + subsystemid 0x1022 0x3050 inherit chip northbridge/amd/amdk8 device pci 18.0 on # southbridge chip southbridge/amd/rs690 diff --git a/src/mainboard/technexion/tim8690/Kconfig b/src/mainboard/technexion/tim8690/Kconfig index b9f34add13..5af6ace48b 100644 --- a/src/mainboard/technexion/tim8690/Kconfig +++ b/src/mainboard/technexion/tim8690/Kconfig @@ -59,12 +59,4 @@ config IRQ_SLOT_COUNT int default 11 -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1022 - -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x3050 - endif # BOARD_TECHNEXION_TIM8690 diff --git a/src/mainboard/technexion/tim8690/devicetree.cb b/src/mainboard/technexion/tim8690/devicetree.cb index 55a2e05323..e1f8936bad 100644 --- a/src/mainboard/technexion/tim8690/devicetree.cb +++ b/src/mainboard/technexion/tim8690/devicetree.cb @@ -15,6 +15,7 @@ chip northbridge/amd/amdk8/root_complex end end device pci_domain 0 on + subsystemid 0x1022 0x3050 inherit chip northbridge/amd/amdk8 device pci 18.0 on # southbridge chip southbridge/amd/rs690 diff --git a/src/mainboard/tyan/Kconfig b/src/mainboard/tyan/Kconfig index 6af48a2d8e..01e4f35e99 100644 --- a/src/mainboard/tyan/Kconfig +++ b/src/mainboard/tyan/Kconfig @@ -74,8 +74,4 @@ config MAINBOARD_VENDOR string default "Tyan" -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x10f1 - endif # VENDOR_TYAN diff --git a/src/mainboard/tyan/s2735/Kconfig b/src/mainboard/tyan/s2735/Kconfig index e1f475b9ba..4aafa3c05d 100644 --- a/src/mainboard/tyan/s2735/Kconfig +++ b/src/mainboard/tyan/s2735/Kconfig @@ -45,8 +45,4 @@ config MAX_PHYSICAL_CPUS int default 2 -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x2735 - endif # BOARD_TYAN_S2735 diff --git a/src/mainboard/tyan/s2735/devicetree.cb b/src/mainboard/tyan/s2735/devicetree.cb index b519a4ad72..c0557f8d18 100644 --- a/src/mainboard/tyan/s2735/devicetree.cb +++ b/src/mainboard/tyan/s2735/devicetree.cb @@ -1,5 +1,6 @@ chip northbridge/intel/e7501 device pci_domain 0 on + subsystemid 0x10f1 0x2735 inherit device pci 0.0 on end device pci 0.1 on end device pci 2.0 on diff --git a/src/mainboard/tyan/s2850/Kconfig b/src/mainboard/tyan/s2850/Kconfig index ab5897a619..c5559515f5 100644 --- a/src/mainboard/tyan/s2850/Kconfig +++ b/src/mainboard/tyan/s2850/Kconfig @@ -23,10 +23,6 @@ config MAINBOARD_PART_NUMBER string default "S2850" -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x2850 - config MAX_CPUS int default 2 diff --git a/src/mainboard/tyan/s2850/devicetree.cb b/src/mainboard/tyan/s2850/devicetree.cb index 6a9a420724..4e981ad0d7 100644 --- a/src/mainboard/tyan/s2850/devicetree.cb +++ b/src/mainboard/tyan/s2850/devicetree.cb @@ -5,6 +5,7 @@ chip northbridge/amd/amdk8/root_complex end end device pci_domain 0 on + subsystemid 0x10f1 0x2850 inherit chip northbridge/amd/amdk8 device pci 18.0 on # LDT0 # devices on link 2, link 2 == LDT 2 diff --git a/src/mainboard/tyan/s2875/Kconfig b/src/mainboard/tyan/s2875/Kconfig index 89a11772ce..56c37236e5 100644 --- a/src/mainboard/tyan/s2875/Kconfig +++ b/src/mainboard/tyan/s2875/Kconfig @@ -25,10 +25,6 @@ config MAINBOARD_PART_NUMBER string default "S2875" -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x2875 - config MAX_CPUS int default 4 diff --git a/src/mainboard/tyan/s2875/devicetree.cb b/src/mainboard/tyan/s2875/devicetree.cb index d3c2582fc0..d3d6c6d14e 100644 --- a/src/mainboard/tyan/s2875/devicetree.cb +++ b/src/mainboard/tyan/s2875/devicetree.cb @@ -5,6 +5,7 @@ chip northbridge/amd/amdk8/root_complex end end device pci_domain 0 on + subsystemid 0x10f1 0x2875 inherit chip northbridge/amd/amdk8 device pci 18.0 on # northbridge # devices on link 0, link 0 == LDT 0 diff --git a/src/mainboard/tyan/s2880/Kconfig b/src/mainboard/tyan/s2880/Kconfig index a98ec0628c..87ec6cab49 100644 --- a/src/mainboard/tyan/s2880/Kconfig +++ b/src/mainboard/tyan/s2880/Kconfig @@ -33,10 +33,6 @@ config MAINBOARD_PART_NUMBER string default "S2880" -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x2880 - config MAX_CPUS int default 2 diff --git a/src/mainboard/tyan/s2880/devicetree.cb b/src/mainboard/tyan/s2880/devicetree.cb index ba43b274b9..b815fb5f1b 100644 --- a/src/mainboard/tyan/s2880/devicetree.cb +++ b/src/mainboard/tyan/s2880/devicetree.cb @@ -5,6 +5,7 @@ chip northbridge/amd/amdk8/root_complex end end device pci_domain 0 on + subsystemid 0x10f1 0x2880 inherit chip northbridge/amd/amdk8 device pci 18.0 on # northbridge # devices on link 0, link 0 == LDT 0 diff --git a/src/mainboard/tyan/s2881/Kconfig b/src/mainboard/tyan/s2881/Kconfig index 81a349d7b6..fd5fca883c 100644 --- a/src/mainboard/tyan/s2881/Kconfig +++ b/src/mainboard/tyan/s2881/Kconfig @@ -35,10 +35,6 @@ config MAINBOARD_PART_NUMBER string default "S2881" -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x2881 - config MAX_CPUS int default 4 diff --git a/src/mainboard/tyan/s2881/devicetree.cb b/src/mainboard/tyan/s2881/devicetree.cb index 24224598ca..7e836ffe56 100644 --- a/src/mainboard/tyan/s2881/devicetree.cb +++ b/src/mainboard/tyan/s2881/devicetree.cb @@ -5,6 +5,7 @@ chip northbridge/amd/amdk8/root_complex end end device pci_domain 0 on + subsystemid 0x10f1 0x2881 inherit chip northbridge/amd/amdk8 device pci 18.0 on end # link 0 device pci 18.0 on end # link 1 diff --git a/src/mainboard/tyan/s2882/Kconfig b/src/mainboard/tyan/s2882/Kconfig index 00e813acc1..c6711b3fe4 100644 --- a/src/mainboard/tyan/s2882/Kconfig +++ b/src/mainboard/tyan/s2882/Kconfig @@ -34,10 +34,6 @@ config MAINBOARD_PART_NUMBER string default "S2882" -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x2882 - config MAX_CPUS int default 4 diff --git a/src/mainboard/tyan/s2882/devicetree.cb b/src/mainboard/tyan/s2882/devicetree.cb index b8f2160928..4f10752d8c 100644 --- a/src/mainboard/tyan/s2882/devicetree.cb +++ b/src/mainboard/tyan/s2882/devicetree.cb @@ -6,6 +6,7 @@ chip northbridge/amd/amdk8/root_complex end device pci_domain 0 on + subsystemid 0x10f1 0x2882 inherit chip northbridge/amd/amdk8 device pci 18.0 on # northbridge # devices on link 0, link 0 == LDT 0 diff --git a/src/mainboard/tyan/s2885/Kconfig b/src/mainboard/tyan/s2885/Kconfig index 03a5952a0d..f4a6f490f0 100644 --- a/src/mainboard/tyan/s2885/Kconfig +++ b/src/mainboard/tyan/s2885/Kconfig @@ -35,10 +35,6 @@ config MAINBOARD_PART_NUMBER string default "S2885" -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x2885 - config MAX_CPUS int default 4 diff --git a/src/mainboard/tyan/s2885/devicetree.cb b/src/mainboard/tyan/s2885/devicetree.cb index 0eb1b9e002..fbb96807d6 100644 --- a/src/mainboard/tyan/s2885/devicetree.cb +++ b/src/mainboard/tyan/s2885/devicetree.cb @@ -5,6 +5,7 @@ chip northbridge/amd/amdk8/root_complex end end device pci_domain 0 on + subsystemid 0x10f1 0x2885 inherit chip northbridge/amd/amdk8 device pci 18.0 on # LDT0 chip southbridge/amd/amd8151 diff --git a/src/mainboard/tyan/s2891/Kconfig b/src/mainboard/tyan/s2891/Kconfig index 31e99b6372..2848380ef2 100644 --- a/src/mainboard/tyan/s2891/Kconfig +++ b/src/mainboard/tyan/s2891/Kconfig @@ -36,10 +36,6 @@ config MAINBOARD_PART_NUMBER string default "S2891" -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x2891 - config MAX_CPUS int default 4 diff --git a/src/mainboard/tyan/s2891/devicetree.cb b/src/mainboard/tyan/s2891/devicetree.cb index 73034b10b9..d793640587 100644 --- a/src/mainboard/tyan/s2891/devicetree.cb +++ b/src/mainboard/tyan/s2891/devicetree.cb @@ -5,6 +5,7 @@ chip northbridge/amd/amdk8/root_complex # Root complex end end device pci_domain 0 on # PCI domain + subsystemid 0x10f1 0x2891 inherit chip northbridge/amd/amdk8 # Northbridge / RAM controller device pci 18.0 on # Link 0 == LDT 0 chip southbridge/nvidia/ck804 # Southbridge diff --git a/src/mainboard/tyan/s2892/Kconfig b/src/mainboard/tyan/s2892/Kconfig index df3430b607..88703f38b6 100644 --- a/src/mainboard/tyan/s2892/Kconfig +++ b/src/mainboard/tyan/s2892/Kconfig @@ -35,10 +35,6 @@ config MAINBOARD_PART_NUMBER string default "S2892" -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x2892 - config MAX_CPUS int default 4 diff --git a/src/mainboard/tyan/s2892/devicetree.cb b/src/mainboard/tyan/s2892/devicetree.cb index b84c04115a..3b999ca42e 100644 --- a/src/mainboard/tyan/s2892/devicetree.cb +++ b/src/mainboard/tyan/s2892/devicetree.cb @@ -5,6 +5,7 @@ chip northbridge/amd/amdk8/root_complex # Root complex end end device pci_domain 0 on # PCI domain + subsystemid 0x10f1 0x2892 inherit chip northbridge/amd/amdk8 # Northbridge / RAM controller device pci 18.0 on # Link 0 == LDT 0 chip southbridge/nvidia/ck804 # Southbridge diff --git a/src/mainboard/tyan/s2895/Kconfig b/src/mainboard/tyan/s2895/Kconfig index 0f8482be2e..f35ea82774 100644 --- a/src/mainboard/tyan/s2895/Kconfig +++ b/src/mainboard/tyan/s2895/Kconfig @@ -40,10 +40,6 @@ config MAINBOARD_PART_NUMBER string default "S2895" -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x2895 - config MAX_CPUS int default 4 diff --git a/src/mainboard/tyan/s2895/devicetree.cb b/src/mainboard/tyan/s2895/devicetree.cb index 7841a0e43c..7d7abc3dd1 100644 --- a/src/mainboard/tyan/s2895/devicetree.cb +++ b/src/mainboard/tyan/s2895/devicetree.cb @@ -5,6 +5,7 @@ chip northbridge/amd/amdk8/root_complex # Root complex end end device pci_domain 0 on # PCI domain + subsystemid 0x10f1 0x2895 inherit chip northbridge/amd/amdk8 # Northbridge / RAM controller device pci 18.0 on # Link 0 == LDT 0 chip southbridge/nvidia/ck804 # Southbridge diff --git a/src/mainboard/tyan/s2912/Kconfig b/src/mainboard/tyan/s2912/Kconfig index 466cb4a889..811e9a7a1b 100644 --- a/src/mainboard/tyan/s2912/Kconfig +++ b/src/mainboard/tyan/s2912/Kconfig @@ -79,10 +79,6 @@ config SERIAL_CPU_INIT bool default n -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x2912 - config IRQ_SLOT_COUNT int default 11 diff --git a/src/mainboard/tyan/s2912/devicetree.cb b/src/mainboard/tyan/s2912/devicetree.cb index 11c6a733bb..0ce4a4895b 100644 --- a/src/mainboard/tyan/s2912/devicetree.cb +++ b/src/mainboard/tyan/s2912/devicetree.cb @@ -5,6 +5,7 @@ chip northbridge/amd/amdk8/root_complex # Root complex end end device pci_domain 0 on # PCI domain + subsystemid 0x10f1 0x2912 inherit chip northbridge/amd/amdk8 # Northbridge / RAM controller device pci 18.0 on end device pci 18.0 on end diff --git a/src/mainboard/tyan/s2912_fam10/Kconfig b/src/mainboard/tyan/s2912_fam10/Kconfig index 58cdb9c83c..d7d5114507 100644 --- a/src/mainboard/tyan/s2912_fam10/Kconfig +++ b/src/mainboard/tyan/s2912_fam10/Kconfig @@ -80,10 +80,6 @@ config SERIAL_CPU_INIT bool default n -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x2912 - config IRQ_SLOT_COUNT int default 11 diff --git a/src/mainboard/tyan/s2912_fam10/devicetree.cb b/src/mainboard/tyan/s2912_fam10/devicetree.cb index 8373ffc344..43bdeb63de 100644 --- a/src/mainboard/tyan/s2912_fam10/devicetree.cb +++ b/src/mainboard/tyan/s2912_fam10/devicetree.cb @@ -5,6 +5,7 @@ chip northbridge/amd/amdfam10/root_complex # Root complex end end device pci_domain 0 on # PCI domain + subsystemid 0x10f1 0x2912 inherit chip northbridge/amd/amdfam10 # Northbridge / RAM controller device pci 18.0 on end device pci 18.0 on end diff --git a/src/mainboard/tyan/s4880/Kconfig b/src/mainboard/tyan/s4880/Kconfig index 5147b979a6..0b425b9c80 100644 --- a/src/mainboard/tyan/s4880/Kconfig +++ b/src/mainboard/tyan/s4880/Kconfig @@ -65,8 +65,4 @@ config IRQ_SLOT_COUNT int default 22 -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x4880 - endif # BOARD_TYAN_S4880 diff --git a/src/mainboard/tyan/s4880/devicetree.cb b/src/mainboard/tyan/s4880/devicetree.cb index cb342357a1..e1aa23a35e 100644 --- a/src/mainboard/tyan/s4880/devicetree.cb +++ b/src/mainboard/tyan/s4880/devicetree.cb @@ -6,6 +6,7 @@ chip northbridge/amd/amdk8/root_complex end device pci_domain 0 on + subsystemid 0x10f1 0x4880 inherit chip northbridge/amd/amdk8 device pci 18.0 on end # LDT0 device pci 18.0 on end # LDT1 diff --git a/src/mainboard/tyan/s4882/Kconfig b/src/mainboard/tyan/s4882/Kconfig index b0d8897af6..3aa1690262 100644 --- a/src/mainboard/tyan/s4882/Kconfig +++ b/src/mainboard/tyan/s4882/Kconfig @@ -65,8 +65,4 @@ config IRQ_SLOT_COUNT int default 22 -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x4882 - endif # BOARD_TYAN_S4882 diff --git a/src/mainboard/tyan/s4882/devicetree.cb b/src/mainboard/tyan/s4882/devicetree.cb index d4a7017f43..767def9ac5 100644 --- a/src/mainboard/tyan/s4882/devicetree.cb +++ b/src/mainboard/tyan/s4882/devicetree.cb @@ -5,6 +5,7 @@ chip northbridge/amd/amdk8/root_complex end end device pci_domain 0 on + subsystemid 0x10f1 0x4882 inherit chip northbridge/amd/amdk8 device pci 18.0 on end # LDT0 device pci 18.0 on # northbridge diff --git a/src/mainboard/via/Kconfig b/src/mainboard/via/Kconfig index f272247563..69805482d9 100644 --- a/src/mainboard/via/Kconfig +++ b/src/mainboard/via/Kconfig @@ -32,8 +32,4 @@ config MAINBOARD_VENDOR string default "VIA" -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1019 - endif # VENDOR_VIA diff --git a/src/mainboard/via/pc2500e/Kconfig b/src/mainboard/via/pc2500e/Kconfig index 3244ea9fc7..70aa8d75fb 100644 --- a/src/mainboard/via/pc2500e/Kconfig +++ b/src/mainboard/via/pc2500e/Kconfig @@ -26,14 +26,6 @@ config IRQ_SLOT_COUNT int default 10 -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1019 - -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0xaa51 - config VGA_BIOS_FILE string default "M14CRT.ROM" diff --git a/src/mainboard/via/pc2500e/devicetree.cb b/src/mainboard/via/pc2500e/devicetree.cb index a891ef17c9..05ce877532 100644 --- a/src/mainboard/via/pc2500e/devicetree.cb +++ b/src/mainboard/via/pc2500e/devicetree.cb @@ -1,5 +1,6 @@ chip northbridge/via/cn700 # Northbridge device pci_domain 0 on # PCI domain + subsystemid 0x1019 0xaa51 inherit device pci 0.0 on end # AGP Bridge device pci 0.1 on end # Error Reporting device pci 0.2 on end # Host Bus Control diff --git a/src/mainboard/wyse/Kconfig b/src/mainboard/wyse/Kconfig index 2607d6cb4e..e4a89d92bd 100644 --- a/src/mainboard/wyse/Kconfig +++ b/src/mainboard/wyse/Kconfig @@ -32,8 +32,4 @@ config MAINBOARD_VENDOR string default "Wyse" -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x102d - endif # VENDOR_WYSE diff --git a/src/mainboard/wyse/s50/devicetree.cb b/src/mainboard/wyse/s50/devicetree.cb index b88bc46b12..504a5de696 100644 --- a/src/mainboard/wyse/s50/devicetree.cb +++ b/src/mainboard/wyse/s50/devicetree.cb @@ -28,6 +28,7 @@ chip northbridge/amd/gx2 end end device pci_domain 0 on + subsystemid 102d 0 inherit device pci 1.0 on end device pci 1.1 on end chip southbridge/amd/cs5536 diff --git a/src/southbridge/intel/i82801gx/pci.c b/src/southbridge/intel/i82801gx/pci.c index a8e8988d57..b32ebd64e3 100644 --- a/src/southbridge/intel/i82801gx/pci.c +++ b/src/southbridge/intel/i82801gx/pci.c @@ -71,13 +71,11 @@ static void ich_pci_dev_enable_resources(struct device *dev) /* Set the subsystem vendor and device id for mainboard devices */ ops = ops_pci(dev); if (dev->on_mainboard && ops && ops->set_subsystem) { - printk(BIOS_DEBUG, "%s subsystem <- %02x/%02x\n", - dev_path(dev), - mainboard_pci_subsystem_vendor_id(dev), - mainboard_pci_subsystem_device_id(dev)); - ops->set_subsystem(dev, - mainboard_pci_subsystem_vendor_id(dev), - mainboard_pci_subsystem_device_id(dev)); + printk(BIOS_DEBUG, "%s subsystem <- %04x/%04x\n", + dev_path(dev), dev->subsystem_vendor, + dev->subsystem_device); + ops->set_subsystem(dev, dev->subsystem_vendor, + dev->subsystem_device); } command = pci_read_config16(dev, PCI_COMMAND); |