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

diff --git a/src/Kconfig b/src/Kconfig
index 28915b2181541ab97dd57b91a3d15cd7e5c59f08..05b4adb55d4dd4b758ba25ab9a343618378a6564 100644 (file)
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -137,13 +137,6 @@ config PCI_BUS_SEGN_BITS
        int
        default 0
 
        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
 config PCI_ROM_RUN
        bool
        default n

diff --git a/src/devices/pci_device.c b/src/devices/pci_device.c
index b6a8078be7ded026f9cad6b63328dec7d1f9b248..2ccb38a75eed74af175abbc65e2ec5a306068486 100644 (file)
--- 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);
 }
 
        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;
 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) {
        /* 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;
        }
        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 d39da7bfdbb3bc0aa800cf79f1a99bf33ee42e6a..2118078dd09170e8efe877b8dc3e2a636a47bfff 100644 (file)
--- a/src/mainboard/amd/bimini_fam10/Kconfig
+++ b/src/mainboard/amd/bimini_fam10/Kconfig
@@ -91,14 +91,6 @@ config HEAP_SIZE
        hex
        default 0xc0000
 
        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
 config RAMBASE
        hex
        default 0x200000

diff --git a/src/mainboard/amd/bimini_fam10/devicetree.cb b/src/mainboard/amd/bimini_fam10/devicetree.cb
index 5916c9fb37b944bff1fae2655f41470e4389cd20..a5bec74e64a9ddb5a8eb049bbbaaba334f3676fd 100644 (file)
--- 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
                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
                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 d1e2649f8a0f0dec450d3733d0be7af9c53359ae..3d3a04cf625220f6e17aa60c60ba0557af9bf94f 100644 (file)
--- a/src/mainboard/amd/dbm690t/Kconfig
+++ b/src/mainboard/amd/dbm690t/Kconfig
@@ -59,12 +59,4 @@ config IRQ_SLOT_COUNT
        int
        default 11
 
        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
 endif # BOARD_AMD_DBM690T

diff --git a/src/mainboard/amd/dbm690t/devicetree.cb b/src/mainboard/amd/dbm690t/devicetree.cb
index d13c5dadc15d417ce09216d6d384cc5f4853bfeb..e1b01b2c061e71dc25fe2de87bb1694d7d2cde7a 100644 (file)
--- 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
                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
                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 8a2c83478d96172c96c1d529ece2dffeafd11040..8e4eca96b51dbd7e122a8f6da8847f0cdead53b7 100644 (file)
--- a/src/mainboard/amd/inagua/Kconfig
+++ b/src/mainboard/amd/inagua/Kconfig
@@ -118,14 +118,6 @@ config ACPI_SSDTX_NUM
         int
         default 0
 
         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
 config RAMBASE
         hex
         default 0x200000

diff --git a/src/mainboard/amd/inagua/devicetree.cb b/src/mainboard/amd/inagua/devicetree.cb
index a0a19ea4e1a878d662c29f351c7965803eee7d00..acae2ca42b03f988b57a6b406d22887d4082043c 100644 (file)
--- 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
                 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
                 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 09adfcbaec71a1667c4b70587c4512c9099c894d..731002de4ff066529e003480958f594f04fc4984 100644 (file)
--- a/src/mainboard/amd/mahogany/Kconfig
+++ b/src/mainboard/amd/mahogany/Kconfig
@@ -73,12 +73,4 @@ config IRQ_SLOT_COUNT
        int
        default 11
 
        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
 endif # BOARD_AMD_MAHOGANY

diff --git a/src/mainboard/amd/mahogany/devicetree.cb b/src/mainboard/amd/mahogany/devicetree.cb
index 796598961798aa5674f4444fcb85e070ab79adb3..d60d5a1f4069403083839f853e96b44c5eece093 100644 (file)
--- 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
                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
                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 0f6c6b37c6f8aa2830da70fd9b877c1c3205d1ed..9c2e081aacff5f2555484c798e3e37a9b8992e0a 100644 (file)
--- a/src/mainboard/amd/mahogany_fam10/Kconfig
+++ b/src/mainboard/amd/mahogany_fam10/Kconfig
@@ -79,14 +79,6 @@ config HEAP_SIZE
        hex
        default 0xc0000
 
        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
 config RAMBASE
        hex
        default 0x200000

diff --git a/src/mainboard/amd/mahogany_fam10/devicetree.cb b/src/mainboard/amd/mahogany_fam10/devicetree.cb
index d1f26d114a82a2f41ae6b8c2e08e1503e6968388..c51e53e7c92477c7332115e99a2e6cde45a4210d 100644 (file)
--- 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
                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
                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 650e7aa543f8e650bd1be680222d0ded2d1a1076..66c37f29f45619af7c1666274ddca7097ad52bc8 100644 (file)
--- a/src/mainboard/amd/persimmon/Kconfig
+++ b/src/mainboard/amd/persimmon/Kconfig
@@ -118,14 +118,6 @@ config ACPI_SSDTX_NUM
         int
         default 0
 
         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
 config RAMBASE
         hex
         default 0x200000

diff --git a/src/mainboard/amd/persimmon/devicetree.cb b/src/mainboard/amd/persimmon/devicetree.cb
index 48fd741ec8ddf35a920347d10b00a1b93d7b9eb1..8ca165b7399a4596fc5ddfacb4d627d85e9a0998 100644 (file)
--- 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
                 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
                 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 b9f37b318861dd400b1f05878c242e24292f27f4..487a59935c79172ae57f8863ef5514242da66cde 100644 (file)
--- a/src/mainboard/amd/pistachio/Kconfig
+++ b/src/mainboard/amd/pistachio/Kconfig
@@ -71,12 +71,4 @@ config IRQ_SLOT_COUNT
        int
        default 11
 
        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
 endif # BOARD_AMD_PISTACHIO

diff --git a/src/mainboard/amd/pistachio/devicetree.cb b/src/mainboard/amd/pistachio/devicetree.cb
index 76f0fe7fc76bf9668582cc03f117d9db6e12d53b..6608fddebf6868027efcd731f0868163e262c78e 100644 (file)
--- 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
                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
                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 6a4aea1abbd9681c237cbfd1708b1d6f724a7e4b..f08fd6e0c5e08565809ace6c32359468bbdca485 100644 (file)
--- 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
 
        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
 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 8ea682fa5a3239e513ac7d6cbc9c97297e536b6d..b819292d5d7bcf60d66fd784a9b6a9730109a3e7 100644 (file)
--- 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
                 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
                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 a49e3c9f38beecfab611729de7d4b7ed23eecbfd..4c9d2a06bf1d0697fab706cb3db05dbf43214c4e 100644 (file)
--- 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
 
        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
 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 7c36509bf8e50be2e43c00d77530879e748670c3..bfbb2b309ac645e5c254c9fd2e8a3bdea2c18240 100644 (file)
--- 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
                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
                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 0d85f864df910f13aff996d3bb7392edf54a940c..b18115b8e99d87275dbe59986a585ba0628fa30d 100644 (file)
--- a/src/mainboard/amd/tilapia_fam10/Kconfig
+++ b/src/mainboard/amd/tilapia_fam10/Kconfig
@@ -79,14 +79,6 @@ config HEAP_SIZE
        hex
        default 0xc0000
 
        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
 config RAMBASE
        hex
        default 0x200000

diff --git a/src/mainboard/amd/tilapia_fam10/devicetree.cb b/src/mainboard/amd/tilapia_fam10/devicetree.cb
index 0a263610f15962a551df9a6eb9a440ae77a20d51..aeb582a678c05783bb332a007a91f76c76e9073c 100644 (file)
--- 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
                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
                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 0019bb439823178033eac105903bc0b26edf8843..7f0e40d6f9e3f29b770ffb5103f40ab15a27f172 100644 (file)
--- a/src/mainboard/arima/hdama/Kconfig
+++ b/src/mainboard/arima/hdama/Kconfig
@@ -21,14 +21,6 @@ config MAINBOARD_DIR
        string
        default arima/hdama
 
        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
 config APIC_ID_OFFSET
        hex
        default 0x0

diff --git a/src/mainboard/arima/hdama/devicetree.cb b/src/mainboard/arima/hdama/devicetree.cb
index c908921076a2361699fb62380448583aa2227eae..d7252e226e1e019561c1f595a787d44cf87690df 100644 (file)
--- 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
                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
                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 e3eb57a2206ac704b7deeadf4c4ca80ff3b49e7b..702165599634127d76e6f48656bfe76c20896968 100644 (file)
--- a/src/mainboard/asrock/939a785gmh/Kconfig
+++ b/src/mainboard/asrock/939a785gmh/Kconfig
@@ -74,12 +74,4 @@ config IRQ_SLOT_COUNT
        int
        default 11
 
        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
 endif # BOARD_ASROCK_939A785GMH

diff --git a/src/mainboard/asrock/939a785gmh/devicetree.cb b/src/mainboard/asrock/939a785gmh/devicetree.cb
index 76f61b02c8f0143df59c871334e7a10d0c5906ab..1dc92a33124b1f1a9d29886b727c9a2728fef91f 100644 (file)
--- 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
                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
                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 06fd4f0f34654e8c0ab3da1a8da61ed30118a71a..9b73ea3240da913b040766b8b34a80ca33e935fb 100644 (file)
--- a/src/mainboard/asrock/e350m1/Kconfig
+++ b/src/mainboard/asrock/e350m1/Kconfig
@@ -118,14 +118,6 @@ config ACPI_SSDTX_NUM
         int
         default 0
 
         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
 config RAMBASE
         hex
         default 0x200000

diff --git a/src/mainboard/asrock/e350m1/devicetree.cb b/src/mainboard/asrock/e350m1/devicetree.cb
index 648db989c1111f8d53a9d837382a3024ebf92162..9dceae670095c7be66f3b7d4f50777b72fbc0dfa 100644 (file)
--- 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
                 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
                 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 bf8742a3f07460bee1991cb7de20d59887089fff..875fd5aa12033dfd8769adacfb06abeca0412b06 100644 (file)
--- a/src/mainboard/asus/Kconfig
+++ b/src/mainboard/asus/Kconfig
@@ -77,8 +77,4 @@ config MAINBOARD_VENDOR
        string
        default "ASUS"
 
        string
        default "ASUS"
 

-config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
-       hex
-       default 0x1043
-

 endif # VENDOR_ASUS
 endif # VENDOR_ASUS

diff --git a/src/mainboard/asus/a8n_e/Kconfig b/src/mainboard/asus/a8n_e/Kconfig
index 6512589bfd04b7f2fd4cf2a8e1be4a4e4ed3deee..aca9e33d0ee9acad1e23853dc346adf778833dce 100644 (file)
--- 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
 
        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
 endif # BOARD_ASUS_A8N_E

diff --git a/src/mainboard/asus/a8n_e/devicetree.cb b/src/mainboard/asus/a8n_e/devicetree.cb
index 1144f0c9ca76adef651e9548a28a7a197b5d4b6d..86bf3aa2e8bf8d9a999126e0f6d09911cf25309a 100644 (file)
--- 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
   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
     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 f9ac563aedc52bbb40bd28dc9783fa1d77f9f856..05408ca0a7af1dfd0aefa1fdd523332cfe149220 100644 (file)
--- 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
 
        hex
        default 0x0
 

-config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
-       hex
-       default 0x1043
-

 endif # BOARD_ASUS_A8V_E_DELUXE
 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 cd803929c8f52c566ab14a0e73a41841239ed747..31df8fa3c1bc85309e8a81333b03a827ac2b3256 100644 (file)
--- 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
     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
     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 abf2bd9252b95d3a8c7eaf9c88fa9ef7c582c5f0..4975cfaebdc0e81e94f1fea7cab17cdc1cae624a 100644 (file)
--- 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
 
        hex
        default 0x0
 

-config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
-       hex
-       default 0x1043
-

 endif # BOARD_ASUS_A8V_E_SE
 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 cd803929c8f52c566ab14a0e73a41841239ed747..3da93fedf7dff0597e7437da8ac2cab9e201061e 100644 (file)
--- 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
     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
     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 60b7e1568442916336c3b44b5b9cb25f7858775d..c23a2df91eb8258e3dae0a7f2b709262a17072af 100644 (file)
--- 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
 
        bool
        default n
 

-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
-       hex
-       default 0x8239
-

 endif # BOARD_ASUS_M2N_E
 endif # BOARD_ASUS_M2N_E

diff --git a/src/mainboard/asus/m2n-e/devicetree.cb b/src/mainboard/asus/m2n-e/devicetree.cb
index dbadf0ed7776f010287222c73a75d03063d08af7..bf4de2585a2ede2b48ee3e4709570f29cb06527f 100644 (file)
--- 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
     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
     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 b6a2fe638f2e6a0126af77765898097e9ce84ed9..09157ee22f1dc9e8eabf695b99ad7c01b4ae493d 100644 (file)
--- 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
 
        hex
        default 0x20
 

-config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
-       hex
-       default 0x1043
-

 endif # BOARD_ASUS_M2V_MX_SE
 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 93a3a879eda68ed5ab69f26482390088976bcc13..7e4c6d1079b58b93ff6bb93a448b7cd5a88c3b13 100644 (file)
--- 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
     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
     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 757bc324c0baeed0cccbf71aaca374b7d51d68d3..571b940bf7357490ab87d6714e1d91c6fe0c324f 100644 (file)
--- a/src/mainboard/asus/m2v/Kconfig
+++ b/src/mainboard/asus/m2v/Kconfig
@@ -75,10 +75,6 @@ config HT_CHAIN_UNITID_BASE
        hex
        default 0x0
 
        hex
        default 0x0
 

-config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
-       hex
-       default 0x1043
-

 config IRQ_SLOT_COUNT
        int
        default 14
 config IRQ_SLOT_COUNT
        int
        default 14

diff --git a/src/mainboard/asus/m2v/devicetree.cb b/src/mainboard/asus/m2v/devicetree.cb
index a08defba930c4f0b271bd03234995c220079d492..5138e252e4ecd67d0c1ca14164e73df6886df2aa 100644 (file)
--- 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
     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
     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 18542d336680e3b4b542909c44c8f565fcc35edf..d036b212bfcdb6fa34ab359b6c507e35df9242d7 100644 (file)
--- a/src/mainboard/asus/m4a78-em/Kconfig
+++ b/src/mainboard/asus/m4a78-em/Kconfig
@@ -77,14 +77,6 @@ config HEAP_SIZE
        hex
        default 0xc0000
 
        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
 config RAMBASE
        hex
        default 0x200000

diff --git a/src/mainboard/asus/m4a78-em/devicetree.cb b/src/mainboard/asus/m4a78-em/devicetree.cb
index 914fde42fae41ea706c9c9b70c830f4d2110bcc3..c463d7174026146925e60f759c8cdf28731fc265 100644 (file)
--- 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
                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
                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 e41fcc2670ac10213040301a31d02ddd6f5796ea..84cc06ceab7af9df4f0a27cae4490d8f6164c24b 100644 (file)
--- a/src/mainboard/asus/m4a785-m/Kconfig
+++ b/src/mainboard/asus/m4a785-m/Kconfig
@@ -78,14 +78,6 @@ config HEAP_SIZE
        hex
        default 0xc0000
 
        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
 config RAMBASE
        hex
        default 0x200000

diff --git a/src/mainboard/asus/m4a785-m/devicetree.cb b/src/mainboard/asus/m4a785-m/devicetree.cb
index 0736b72c0805d73ffb0838faf692159e762e6616..e8764b1ebaf70dc6bc28629459fc20e7fa64ad80 100644 (file)
--- 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
                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
                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 63a2975a1545d2898daab7b564e185b2042ff847..4bad57ddd8bd19a639231cef8bb391ff27fb5787 100644 (file)
--- a/src/mainboard/broadcom/blast/Kconfig
+++ b/src/mainboard/broadcom/blast/Kconfig
@@ -70,12 +70,4 @@ config IRQ_SLOT_COUNT
        int
        default 11
 
        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
 endif # BOARD_BROADCOM_BLAST

diff --git a/src/mainboard/broadcom/blast/devicetree.cb b/src/mainboard/broadcom/blast/devicetree.cb
index c50ebc7834c1b9199fe6849834622d16e0b0a5f3..6779a7a1529853c147e4f6deed326e50b9a22182 100644 (file)
--- 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
                 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
                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 4185dfcb9c23bdfa84aeb8d673258aa859818946..381c9f64794ef9de2e498f2d8e7fd4a40b117998 100644 (file)
--- a/src/mainboard/dell/s1850/Kconfig
+++ b/src/mainboard/dell/s1850/Kconfig
@@ -26,14 +26,6 @@ config MAINBOARD_PART_NUMBER
        string
        default "PowerEdge 1850"
 
        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
 config MAX_CPUS
        int
        default 4

diff --git a/src/mainboard/dell/s1850/devicetree.cb b/src/mainboard/dell/s1850/devicetree.cb
index de8c90ba72276113aec39ecad56e2fa1c7d85cd6..c56fd378eea40afd6a5d8a36921b9391866465a9 100644 (file)
--- 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
 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
                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 6571b318ed64738645449bd22e6b63ab698ca412..d25db854f2ba8bd2eee31ad44db3d4abe6f7d63e 100644 (file)
--- 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
 
        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
 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 62f9238b1cc251bd1ce77c6c51800097beca2274..e1aac4eb357c8556f268d711ff32c14640034b8b 100644 (file)
--- 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
                 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
                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 e36dccc8da40cacfe927ee0917d2975ba1f308d0..7250a9c6df446e0cbdc676b05da70a3fb3e8a8a4 100644 (file)
--- a/src/mainboard/gigabyte/m57sli/Kconfig
+++ b/src/mainboard/gigabyte/m57sli/Kconfig
@@ -82,14 +82,6 @@ config SERIAL_CPU_INIT
        bool
        default n
 
        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
 config IRQ_SLOT_COUNT
        int
        default 11

diff --git a/src/mainboard/gigabyte/m57sli/devicetree.cb b/src/mainboard/gigabyte/m57sli/devicetree.cb
index 3bae560c6890b187b7ebbcf14a09466c6861f7ee..2184de5050690ac34ec9f5ea19fa730920cd6cdc 100644 (file)
--- 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
     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
   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 96b456cec6ae5e8a92f3c96001cd70995542238a..fd511a8a83837d63a60664f430f49a52891c383c 100644 (file)
--- a/src/mainboard/gigabyte/ma785gmt/Kconfig
+++ b/src/mainboard/gigabyte/ma785gmt/Kconfig
@@ -79,14 +79,6 @@ config HEAP_SIZE
        hex
        default 0xc0000
 
        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
 config RAMBASE
        hex
        default 0x200000

diff --git a/src/mainboard/gigabyte/ma785gmt/devicetree.cb b/src/mainboard/gigabyte/ma785gmt/devicetree.cb
index dc7bd10a80df320562f8a8ff44d026adef42a1ed..02e4bc888a719a96525337cffa4ad7594e820a41 100644 (file)
--- 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
                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
                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 cf3f6a27adea7ecfb7c6887242f44944e531c1aa..56b819ef62081986ce23205db6b636d96b801942 100644 (file)
--- a/src/mainboard/gigabyte/ma78gm/Kconfig
+++ b/src/mainboard/gigabyte/ma78gm/Kconfig
@@ -79,14 +79,6 @@ config HEAP_SIZE
        hex
        default 0xc0000
 
        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
 config RAMBASE
        hex
        default 0x200000

diff --git a/src/mainboard/gigabyte/ma78gm/devicetree.cb b/src/mainboard/gigabyte/ma78gm/devicetree.cb
index 59e1502dd7c0ef1b27db6237f1b234e6032ab0a3..38ff642c102e60faa947b20154512a332788b8a9 100644 (file)
--- 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
                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
                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 bb4a33dae332cd458a67fa232440837fb799beac..eb90b070324b9ce94b5a622e16993e3e50b6bf3f 100644 (file)
--- 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"
 
        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
 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 bd37862bcf5a8ab2e9161208d751fa79f67461b9..3237723a5312399b136c97b92fa1ffe69ed2a1db 100644 (file)
--- 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
     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
     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 e662fe4227092227e44c904813facf5443384e35..8fb1950b8d96da986b479e3b192c780e3575750b 100644 (file)
--- 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
 
        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
 config RAMBASE
        hex
        default 0x200000

diff --git a/src/mainboard/intel/Kconfig b/src/mainboard/intel/Kconfig
index 612b1c17534bf95988fc1114fd6593c7e450e4bb..ff8d63b1d87cb91be537281cf7ce9ae410b443e1 100644 (file)
--- a/src/mainboard/intel/Kconfig
+++ b/src/mainboard/intel/Kconfig
@@ -32,8 +32,4 @@ config MAINBOARD_VENDOR
        string
        default "Intel"
 
        string
        default "Intel"
 

-config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
-       hex
-       default 0x8086
-

 endif # VENDOR_INTEL
 endif # VENDOR_INTEL

diff --git a/src/mainboard/intel/d945gclf/Kconfig b/src/mainboard/intel/d945gclf/Kconfig
index 04643bbbba400639f007e0d34019a9dfd82e4ae6..ff8c638f0aa5574fd28282d517233a6f299165eb 100644 (file)
--- a/src/mainboard/intel/d945gclf/Kconfig
+++ b/src/mainboard/intel/d945gclf/Kconfig
@@ -49,10 +49,6 @@ config MAINBOARD_PART_NUMBER
        string
        default "D945GCLF"
 
        string
        default "D945GCLF"
 

-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
-       hex
-       default 0x464C
-

 config MMCONF_BASE_ADDRESS
        hex
        default 0xf0000000
 config MMCONF_BASE_ADDRESS
        hex
        default 0xf0000000

diff --git a/src/mainboard/intel/d945gclf/devicetree.cb b/src/mainboard/intel/d945gclf/devicetree.cb
index c808cdc7631812e59a2dcb8a6625b5e6cf9ddf59..a58d99e61ed5b93ce29df6f39c2214df5cac014d 100644 (file)
--- 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
         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
                 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 2ac8ea3c13cdb90174a207d2bf8f172004fb3b76..494086ebb6be3ab3c24a84f46427ae0d36754db2 100644 (file)
--- a/src/mainboard/intel/jarrell/Kconfig
+++ b/src/mainboard/intel/jarrell/Kconfig
@@ -35,14 +35,6 @@ config IRQ_SLOT_COUNT
        int
        default 18
 
        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
 config DIMM_MAP_LOGICAL
        hex
        default 0x0124

diff --git a/src/mainboard/intel/jarrell/devicetree.cb b/src/mainboard/intel/jarrell/devicetree.cb
index a187d230416c99dc4cee59b1c0b88d23e086b17d..fb32a089e3dfa8b1c39cf6d56c15020c947317dd 100644 (file)
--- 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
 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
                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 76dec5eb374d2cee4e488fdb2ccae6ac5daa0a9e..76477b0d38f2c17f2e8a490c5a2cf69881119e8d 100644 (file)
--- a/src/mainboard/intel/mtarvon/Kconfig
+++ b/src/mainboard/intel/mtarvon/Kconfig
@@ -25,14 +25,6 @@ config IRQ_SLOT_COUNT
        int
        default 1
 
        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
 config DCACHE_RAM_BASE
        hex
        default 0xffdf8000

diff --git a/src/mainboard/intel/mtarvon/devicetree.cb b/src/mainboard/intel/mtarvon/devicetree.cb
index 8585b54e17f4a97728fe26a2c44f7269b770b878..cd7df2d1d29f4ebf2f33863a8315f016f10f9712 100644 (file)
--- 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
 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
                 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 1ba71372db4f7f1cc9fa99f4a46a28a94f8ec59c..5f7de086e7c879e9dbcecc729672f56cac05cdfc 100644 (file)
--- a/src/mainboard/intel/truxton/Kconfig
+++ b/src/mainboard/intel/truxton/Kconfig
@@ -27,14 +27,6 @@ config IRQ_SLOT_COUNT
        int
        default 1
 
        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
 config MAX_CPUS
        int
        default 4

diff --git a/src/mainboard/intel/truxton/devicetree.cb b/src/mainboard/intel/truxton/devicetree.cb
index 7563f028f9a9a30557cd2ffbf1f569df8877d833..486601a420ed75a409279920e97bc8dac9c10f1e 100644 (file)
--- 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
 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
                 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 35a1cd1f69544582c2f565227d69cd3bd563de64..916342376f702436c7d91fc397e480745b93adf2 100644 (file)
--- a/src/mainboard/intel/xe7501devkit/Kconfig
+++ b/src/mainboard/intel/xe7501devkit/Kconfig
@@ -37,12 +37,4 @@ config MAX_PHYSICAL_CPUS
        int
        default 2
 
        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
 endif # BOARD_INTEL_XE7501DEVKIT

diff --git a/src/mainboard/intel/xe7501devkit/devicetree.cb b/src/mainboard/intel/xe7501devkit/devicetree.cb
index 327545785f822dcff84487bf447b57a408dab991..18ee64e0db09da87ab547f135e8e2fa7fb85562e 100644 (file)
--- 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
 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
                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 414fa457d26d222ad44915931e339a1d7b4ec5b3..e58fe4e9420c8bda66aecf32a433aac691c28ee3 100644 (file)
--- 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
 
        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
 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 e1cb93955266ce01b4655b8803d04793d265ea6b..d0cff02273cd5a71b3fb90cb04dbcf51c4c777bd 100644 (file)
--- 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
                 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
                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 d144b7d8a6e969cc33e121788eb87728e0663c85..78d0637a545f5d3c735bce15513bf6bd9704eed4 100644 (file)
--- a/src/mainboard/iwill/dk8s2/Kconfig
+++ b/src/mainboard/iwill/dk8s2/Kconfig
@@ -60,12 +60,4 @@ config IRQ_SLOT_COUNT
        int
        default 12
 
        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
 endif # BOARD_IWILL_DK8S2

diff --git a/src/mainboard/iwill/dk8s2/devicetree.cb b/src/mainboard/iwill/dk8s2/devicetree.cb
index 8185b5dc1a492be9a192981ba59a43ff564f5434..35b230735f02c74159874b9aa9c06c163d2877c3 100644 (file)
--- 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
                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
                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 10fab734a5e790472cfa95bffdf168401bcce0b3..62adb537e9a0ae0a2b827772d7181f5007203dc1 100644 (file)
--- a/src/mainboard/jetway/pa78vm5/Kconfig
+++ b/src/mainboard/jetway/pa78vm5/Kconfig
@@ -79,14 +79,6 @@ config HEAP_SIZE
        hex
        default 0xc0000
 
        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
 config RAMBASE
        hex
        default 0x200000

diff --git a/src/mainboard/jetway/pa78vm5/devicetree.cb b/src/mainboard/jetway/pa78vm5/devicetree.cb
index 73f6ac25cd7b46e32f6d8994ee6ecd1b1c51b0b5..6913d79f9fbc6f8bdd8dfe65fb8eea0a73ac4c6b 100644 (file)
--- 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
                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
                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 891de59345477505f5905434b42f0d7c7849ea25..91d6b67ef2b45c80f9380a882db1fb8ee0a277fc 100644 (file)
--- a/src/mainboard/kontron/kt690/Kconfig
+++ b/src/mainboard/kontron/kt690/Kconfig
@@ -28,14 +28,6 @@ config MAINBOARD_DIR
        string
        default kontron/kt690
 
        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
 config APIC_ID_OFFSET
        hex
        default 0x0

diff --git a/src/mainboard/kontron/kt690/devicetree.cb b/src/mainboard/kontron/kt690/devicetree.cb
index d509050189f2baa9ec2984363a9013d18f62a640..68741aeaa266d2421d19ac261a398c60459bacbe 100644 (file)
--- 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
                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
                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 40e16b3d02d92be5e0b1644c252edc874f80ae7b..2817255e822a5b9d2d8a5b1f96fe293c31aad11e 100644 (file)
--- a/src/mainboard/lenovo/x60/devicetree.cb
+++ b/src/mainboard/lenovo/x60/devicetree.cb
@@ -22,17 +22,23 @@
 
 chip northbridge/intel/i945
 
 
 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"
                        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)
                        #  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"
 
 
                        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 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
                        device pci 1f.0 on # PCI-LPC bridge

+                               subsystemid 0x17aa 0x2009

                                chip ec/lenovo/pmh7
                                        device pnp ff.1 on # dummy
                                        end
                                chip ec/lenovo/pmh7
                                        device pnp ff.1 on # dummy
                                        end


@@ -120,9 +139,15 @@ chip northbridge/intel/i945
                                        end
                                end
                        end
                                        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
                end
                chip southbridge/ricoh/rl5c476
                end

diff --git a/src/mainboard/msi/Kconfig b/src/mainboard/msi/Kconfig
index c2f1595877ad5f8302799e6d2194214cb3f8c9eb..3d0de4a5e86137ecd01999f13ab149aafd21c2e6 100644 (file)
--- a/src/mainboard/msi/Kconfig
+++ b/src/mainboard/msi/Kconfig
@@ -56,8 +56,4 @@ config MAINBOARD_VENDOR
        string
        default "MSI"
 
        string
        default "MSI"
 

-config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
-       hex
-       default 0x1462
-

 endif # VENDOR_MSI
 endif # VENDOR_MSI

diff --git a/src/mainboard/msi/ms7135/Kconfig b/src/mainboard/msi/ms7135/Kconfig
index d8581f731cfc55dc9e24e95885a9350ffbce86ec..0611be2ba95ba131de462f996e7ca409f01699aa 100644 (file)
--- a/src/mainboard/msi/ms7135/Kconfig
+++ b/src/mainboard/msi/ms7135/Kconfig
@@ -34,10 +34,6 @@ config MAINBOARD_PART_NUMBER
        string
        default "MS-7135"
 
        string
        default "MS-7135"
 

-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
-       hex
-       default 0x7135
-

 config MAX_CPUS
        int
        default 2
 config MAX_CPUS
        int
        default 2

diff --git a/src/mainboard/msi/ms7135/devicetree.cb b/src/mainboard/msi/ms7135/devicetree.cb
index 14c6bad1d3daeb8ff66f48c57d7e3e2eb896c2cc..54e5d5e599b107f70608521c1d3a4c983c1d0f82 100644 (file)
--- 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
   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
     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 aec6af50b7c14f9d24b8f72989cb046191bbcba9..be425ecac8c3902b6c75dcc2943825d3641de3cf 100644 (file)
--- a/src/mainboard/msi/ms7260/Kconfig
+++ b/src/mainboard/msi/ms7260/Kconfig
@@ -80,14 +80,6 @@ config SERIAL_CPU_INIT
        bool
        default n
 
        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
 config IRQ_SLOT_COUNT
        int
        default 11

diff --git a/src/mainboard/msi/ms7260/devicetree.cb b/src/mainboard/msi/ms7260/devicetree.cb
index 552224d2c39da59085737d6b5d2a25c64ddfcce8..47d5381b5c57f1c8a282bbd45e5d3e15eb64e9fc 100644 (file)
--- 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
     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
     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 5e2835300780f617ca2fdd101bf014f181619bbc..1464acd5a2277919353d126744adf7ce89e5428c 100644 (file)
--- a/src/mainboard/msi/ms9185/Kconfig
+++ b/src/mainboard/msi/ms9185/Kconfig
@@ -71,12 +71,4 @@ config IRQ_SLOT_COUNT
        int
        default 11
 
        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
 endif # BOARD_MSI_MS9185

diff --git a/src/mainboard/msi/ms9185/devicetree.cb b/src/mainboard/msi/ms9185/devicetree.cb
index fc566e23d39ee7489ff5820febfa3d26a47898cc..9576225e913b4ef52e6f55b7ecb8daaed879b7d5 100644 (file)
--- 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
                 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
                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 f2ea65ad4b325ecc471262b4bc841e789d61c5a6..3ccc3f97560edb49fda29bfeeb4f5981df1437b2 100644 (file)
--- a/src/mainboard/msi/ms9282/Kconfig
+++ b/src/mainboard/msi/ms9282/Kconfig
@@ -72,14 +72,6 @@ config SERIAL_CPU_INIT
        bool
        default n
 
        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
 config IRQ_SLOT_COUNT
        int
        default 11

diff --git a/src/mainboard/msi/ms9282/devicetree.cb b/src/mainboard/msi/ms9282/devicetree.cb
index 74ea1832ee75a50b4b88f8dfc0cb702770fd7574..b52e7ed650d7eb30c5928c2dae641bb4b77589e0 100644 (file)
--- 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
     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
     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 d8025d789e0d4697fc6806ddff9d7e7d51a12e6e..948d320735b5774dfb11eb7a85ae8fe66e5d08c4 100644 (file)
--- 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"
 
        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
 config RAMBASE
        hex
        default 0x200000

diff --git a/src/mainboard/msi/ms9652_fam10/devicetree.cb b/src/mainboard/msi/ms9652_fam10/devicetree.cb
index c3e4e4f16d677d6ef477c7eca892404a0f67d3f9..0e9a3ffe3e6e5ca4e7034138699d4fcd0dfa92b3 100644 (file)
--- 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
     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
     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 d11d6eaf7d0bf71f57d42c70cd4842125db93bb2..fc4c22387eefdc9a8980ec3579af7a5cd46510d7 100644 (file)
--- a/src/mainboard/newisys/khepri/Kconfig
+++ b/src/mainboard/newisys/khepri/Kconfig
@@ -69,12 +69,4 @@ config IRQ_SLOT_COUNT
        int
        default 9
 
        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
 endif # BOARD_NEWISYS_KHEPRI

diff --git a/src/mainboard/newisys/khepri/devicetree.cb b/src/mainboard/newisys/khepri/devicetree.cb
index a56a010b339a102116e27c497a7822aa8d0d911e..9cdbc9c66126676ea8910b9552ecdfde31fa0b4c 100644 (file)
--- 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
        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
                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 80f5e3458bde8bfc6a9d2541f1e22d3741b9654b..bfec32343f1f1bbb7b7e58310ac17b5857eac0f3 100644 (file)
--- 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
 
        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
 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 1340cb38f72ac7473983f0114b9abe4bef5301b0..9a807107cb9f965eeb01cb83ba0e8c69e4d8ae2c 100644 (file)
--- 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
     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
     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 d2f1e9500dc6dcb9c7d34ed12d0949a99d699494..ba4b6ec13a77559b237ad42224135e1d5cd12836 100644 (file)
--- a/src/mainboard/roda/Kconfig
+++ b/src/mainboard/roda/Kconfig
@@ -14,8 +14,4 @@ config MAINBOARD_VENDOR
        string
        default "Roda"
 
        string
        default "Roda"
 

-config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
-       hex
-       default 0x4352
-

 endif # VENDOR_RODA
 endif # VENDOR_RODA

diff --git a/src/mainboard/roda/rk886ex/Kconfig b/src/mainboard/roda/rk886ex/Kconfig
index 647511a3d34fe963a23e6cf85c5135d3b402a39b..340ee98fe46cf9dd48cf6f679127421f0b61f3fe 100644 (file)
--- a/src/mainboard/roda/rk886ex/Kconfig
+++ b/src/mainboard/roda/rk886ex/Kconfig
@@ -46,10 +46,6 @@ config MAX_PHYSICAL_CPUS
        int
        default 2
 
        int
        default 2
 

-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
-       hex
-       default 0x6886
-

 config MAXIMUM_SUPPORTED_FREQUENCY
        int
        default 400
 config MAXIMUM_SUPPORTED_FREQUENCY
        int
        default 400

diff --git a/src/mainboard/roda/rk886ex/devicetree.cb b/src/mainboard/roda/rk886ex/devicetree.cb
index a71333117208c51d2e2c81e3a404668024388450..5de2cc32ce11235c5e3977751e867fd1cc286e4e 100644 (file)
--- 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
         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
                 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 3b8544b1b0f2e5982134f4fb8c031235c0c11258..81a6608208bcf63d187218b0261add3473b51a35 100644 (file)
--- a/src/mainboard/sunw/ultra40/Kconfig
+++ b/src/mainboard/sunw/ultra40/Kconfig
@@ -75,12 +75,4 @@ config IRQ_SLOT_COUNT
        int
        default 11
 
        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
 endif # BOARD_SUNW_ULTRA40

diff --git a/src/mainboard/sunw/ultra40/devicetree.cb b/src/mainboard/sunw/ultra40/devicetree.cb
index 059724ee37c708f8307cb4cd03aca58703236b0c..f355200ce65aa8d8c49c107a5d01dbbf023cffb8 100644 (file)
--- 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
     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
     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 5ac7ddac367b38e2faf107468e9b18b23dadc205..8e5694cf1b80ab0e3e9083157a28a31e0fb3cd7f 100644 (file)
--- a/src/mainboard/supermicro/Kconfig
+++ b/src/mainboard/supermicro/Kconfig
@@ -38,8 +38,4 @@ config MAINBOARD_VENDOR
        string
        default "Supermicro"
 
        string
        default "Supermicro"
 

-config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
-       hex
-       default 0x15d9
-

 endif # VENDOR_SUPERMICRO
 endif # VENDOR_SUPERMICRO

diff --git a/src/mainboard/supermicro/h8dme/Kconfig b/src/mainboard/supermicro/h8dme/Kconfig
index 0259b4af0c52901c57ac60ca11a785ddbfb65a96..ce49a4781e8cbdff26cb24e90f7e057cde47fcd0 100644 (file)
--- a/src/mainboard/supermicro/h8dme/Kconfig
+++ b/src/mainboard/supermicro/h8dme/Kconfig
@@ -81,12 +81,4 @@ config IRQ_SLOT_COUNT
        int
        default 11
 
        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
 endif # BOARD_SUPERMICRO_H8DME

diff --git a/src/mainboard/supermicro/h8dme/devicetree.cb b/src/mainboard/supermicro/h8dme/devicetree.cb
index df40dc34e4a0b8ac3419b733e6423bb4dae20cbe..73a43e827109afd7561632a9f9b1fffc24271ed1 100644 (file)
--- 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
     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
     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 81517bed1feba99ab52d2ab048bc7cea91133d3f..5527319ce8a7c99b543188232cf56d3dce986ef3 100644 (file)
--- a/src/mainboard/supermicro/h8dmr/Kconfig
+++ b/src/mainboard/supermicro/h8dmr/Kconfig
@@ -80,12 +80,4 @@ config IRQ_SLOT_COUNT
        int
        default 11
 
        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
 endif # BOARD_SUPERMICRO_H8DMR

diff --git a/src/mainboard/supermicro/h8dmr/devicetree.cb b/src/mainboard/supermicro/h8dmr/devicetree.cb
index 1dfd32ac5c577f8bcbae67e8d8ac11c6cba8e831..6c96ac0deaffc7d6bd65e430d32386c1e3b1c14e 100644 (file)
--- 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
     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
     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 4b31bf30a7c75b372b1aa3c5afad50219f68713e..195bc5cf411bc4e8ee6ab24cb060f0f4d3d781dd 100644 (file)
--- 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
 
        bool
        default n
 

-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
-       hex
-       default 0x1511
-

 endif # BOARD_SUPERMICRO_H8DMR_FAM10
 endif # BOARD_SUPERMICRO_H8DMR_FAM10

diff --git a/src/mainboard/supermicro/h8dmr_fam10/devicetree.cb b/src/mainboard/supermicro/h8dmr_fam10/devicetree.cb
index da82b173768422fc1e913bfc3a5db44a25148e5c..6c4443f902d08c5f8034fb7c80d566f148c0c3eb 100644 (file)
--- 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
     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
     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 bd0f550d17fe7b33dae2dbf2161a619bb36febfb..1d4f8e76ccc5aee0aaba2dbd453110fea3a53e0e 100644 (file)
--- 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
 
        bool
        default y
 

-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
-       hex
-       default 0x1511
-

 config STACK_SIZE
        hex
        default 0x10000
 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 990afa4c646a7d2a76bd0268ddb3f2e326b46da8..56ba7b539587ad2f07e73fe27d7fe067c4451b63 100644 (file)
--- 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
     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
     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 8b1cf5a27453811fbd140003d5b49e3c309842f3..bac1008a1a16a7901c6a95d7fc83f7427addb59f 100644 (file)
--- 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"
 
        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
 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 c8ce779ca24aafa3d0d4296e0a3b44f0abc7e66c..e6201a811e3db9878ea514ea1019368172748d7d 100644 (file)
--- 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
 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"
                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 8771d9ec58d910a7357c97e0850c9a432ed3e0d7..e8466be8a33a6af461acd7e7c17ced22abf41f2f 100644 (file)
--- 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"
 
        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
 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 6dd6b17d66db6216f74bb05d04ed0221cd2e019d..08c0751c0020888694b0302c9e3dd2469006f8d7 100644 (file)
--- 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
                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"
                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 96549d6154133096428acaf21aa6badabb2ffcc2..e9d404191e6c378bb631d4f8f76ca83f4d7afc21 100644 (file)
--- 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"
 
        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
 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 04110b0eb7bd7807b9785fd2683801409539b9ec..ecfe0a00a325545af46a712d75a1669efe49d974 100644 (file)
--- 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
                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"
                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 d1163d74b7d5e8434780b14b7ba0518da4b04f31..a146e77a6cac09077f78a6df132f8016394abf60 100644 (file)
--- 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"
 
        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
 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 df778ed61b92b85b69dc3410bd810eafedf688f2..6ada3b1341ac7581251f58c8fbebfc207b0187af 100644 (file)
--- 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
 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
                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 494b0ed43c4ee20040b4f63ddd10a65b861e25d0..6196e2ab712a471a7d56851a27b624d57dbf4de0 100644 (file)
--- 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"
 
        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
 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 77c9e9d7cb3bbb193d08a102935ce885e520d496..3d9b644fd942e76290d687356dad5fedf70faf6f 100644 (file)
--- 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
 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
                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 d855df12f29d475b303fb2a702d5f72be6296067..21cfa7b1d0bff883ffa293a5b18db3e6a3e784ce 100644 (file)
--- a/src/mainboard/technexion/tim5690/Kconfig
+++ b/src/mainboard/technexion/tim5690/Kconfig
@@ -60,14 +60,6 @@ config IRQ_SLOT_COUNT
        int
        default 11
 
        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
 config STACK_SIZE
        hex
        default 0x2000

diff --git a/src/mainboard/technexion/tim5690/devicetree.cb b/src/mainboard/technexion/tim5690/devicetree.cb
index c129a2d9c6ec43902ac4d5662d2abc8da172f56e..148a4ab469fe0f98e9ebd29b3005c990ed1adce1 100644 (file)
--- 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
                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
                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 b9f34add130dc0a198806d232bce4b672caa7299..5af6ace48bd2c8b41a39c4373eee264a70556d3a 100644 (file)
--- a/src/mainboard/technexion/tim8690/Kconfig
+++ b/src/mainboard/technexion/tim8690/Kconfig
@@ -59,12 +59,4 @@ config IRQ_SLOT_COUNT
        int
        default 11
 
        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
 endif # BOARD_TECHNEXION_TIM8690

diff --git a/src/mainboard/technexion/tim8690/devicetree.cb b/src/mainboard/technexion/tim8690/devicetree.cb
index 55a2e05323cb7aaeb3513c83861b0d50f3679e69..e1f8936bad7594aa768fd1c0de9744781d554004 100644 (file)
--- 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
                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
                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 6af48a2d8e7e2c8be83e10eea28ae7dbe4809553..01e4f35e99601018064eec0d213149d85470cce6 100644 (file)
--- a/src/mainboard/tyan/Kconfig
+++ b/src/mainboard/tyan/Kconfig
@@ -74,8 +74,4 @@ config MAINBOARD_VENDOR
        string
        default "Tyan"
 
        string
        default "Tyan"
 

-config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
-       hex
-       default 0x10f1
-

 endif # VENDOR_TYAN
 endif # VENDOR_TYAN

diff --git a/src/mainboard/tyan/s2735/Kconfig b/src/mainboard/tyan/s2735/Kconfig
index e1f475b9ba56e342929b5a4b0bf02c333f10b37a..4aafa3c05d1882daa0b1a8fae69f7a0b9364ea00 100644 (file)
--- a/src/mainboard/tyan/s2735/Kconfig
+++ b/src/mainboard/tyan/s2735/Kconfig
@@ -45,8 +45,4 @@ config MAX_PHYSICAL_CPUS
        int
        default 2
 
        int
        default 2
 

-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
-       hex
-       default 0x2735
-

 endif # BOARD_TYAN_S2735
 endif # BOARD_TYAN_S2735

diff --git a/src/mainboard/tyan/s2735/devicetree.cb b/src/mainboard/tyan/s2735/devicetree.cb
index b519a4ad72a4fa7e553f99680e81c27e8d366531..c0557f8d182fed701f5dd24140dd6734830cb253 100644 (file)
--- 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
 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
                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 ab5897a6199e2f31d3b6c270e6c091391e38bf0c..c5559515f5e825d6b0dd6df6b045fbc5fb7604c9 100644 (file)
--- a/src/mainboard/tyan/s2850/Kconfig
+++ b/src/mainboard/tyan/s2850/Kconfig
@@ -23,10 +23,6 @@ config MAINBOARD_PART_NUMBER
        string
        default "S2850"
 
        string
        default "S2850"
 

-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
-       hex
-       default 0x2850
-

 config MAX_CPUS
        int
        default 2
 config MAX_CPUS
        int
        default 2

diff --git a/src/mainboard/tyan/s2850/devicetree.cb b/src/mainboard/tyan/s2850/devicetree.cb
index 6a9a420724148f8c2f74c0a5b36c39faf1f34ad5..4e981ad0d7aad854c90c5855425450ffbbdbc043 100644 (file)
--- 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
                 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
                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 89a11772ce662e40fd35d629bfc36ec8d8115fc2..56c37236e562b4332242cbc8fb18c0321a448b73 100644 (file)
--- a/src/mainboard/tyan/s2875/Kconfig
+++ b/src/mainboard/tyan/s2875/Kconfig
@@ -25,10 +25,6 @@ config MAINBOARD_PART_NUMBER
        string
        default "S2875"
 
        string
        default "S2875"
 

-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
-       hex
-       default 0x2875
-

 config MAX_CPUS
        int
        default 4
 config MAX_CPUS
        int
        default 4

diff --git a/src/mainboard/tyan/s2875/devicetree.cb b/src/mainboard/tyan/s2875/devicetree.cb
index d3c2582fc0a29d2ba034f2eab20017e877adab44..d3d6c6d14e6ebae753ebfddfd9f70756c23431a2 100644 (file)
--- 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
                 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
                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 a98ec0628c7731eab40d968dc5e3ddd5ff4e230b..87ec6cab491e9288d8ec3ee0701c09deee2ee25a 100644 (file)
--- a/src/mainboard/tyan/s2880/Kconfig
+++ b/src/mainboard/tyan/s2880/Kconfig
@@ -33,10 +33,6 @@ config MAINBOARD_PART_NUMBER
        string
        default "S2880"
 
        string
        default "S2880"
 

-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
-       hex
-       default 0x2880
-

 config MAX_CPUS
        int
        default 2
 config MAX_CPUS
        int
        default 2

diff --git a/src/mainboard/tyan/s2880/devicetree.cb b/src/mainboard/tyan/s2880/devicetree.cb
index ba43b274b9644a615974265bd0389baaa6d2d40d..b815fb5f1b0735654c939fd0f66524b8b2103c16 100644 (file)
--- 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
                 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
                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 81a349d7b6ead674592be01ea02a0ae04ba89319..fd5fca883cde422c97209be42b16a57fa72cdc0a 100644 (file)
--- a/src/mainboard/tyan/s2881/Kconfig
+++ b/src/mainboard/tyan/s2881/Kconfig
@@ -35,10 +35,6 @@ config MAINBOARD_PART_NUMBER
        string
        default "S2881"
 
        string
        default "S2881"
 

-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
-       hex
-       default 0x2881
-

 config MAX_CPUS
        int
        default 4
 config MAX_CPUS
        int
        default 4

diff --git a/src/mainboard/tyan/s2881/devicetree.cb b/src/mainboard/tyan/s2881/devicetree.cb
index 24224598caf4c29ac93c1712eb53ecd0566f57d3..7e836ffe56d4204b1970b13ecb7c0f655f6fcf36 100644 (file)
--- 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
     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
     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 00e813acc1e3483ee56a81ad907d103a7f9367bb..c6711b3fe4612110480a4484f415f4a159d31f34 100644 (file)
--- a/src/mainboard/tyan/s2882/Kconfig
+++ b/src/mainboard/tyan/s2882/Kconfig
@@ -34,10 +34,6 @@ config MAINBOARD_PART_NUMBER
        string
        default "S2882"
 
        string
        default "S2882"
 

-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
-       hex
-       default 0x2882
-

 config MAX_CPUS
        int
        default 4
 config MAX_CPUS
        int
        default 4

diff --git a/src/mainboard/tyan/s2882/devicetree.cb b/src/mainboard/tyan/s2882/devicetree.cb
index b8f2160928b262645e63aac4aae64337e1aaa801..4f10752d8c923ac873b6d77066429ff5bf163b97 100644 (file)
--- 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
         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
                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 03a5952a0dacc20b6278f39845e4bf78099f723f..f4a6f490f00fd28069b28bcaf8c17c8f27770d36 100644 (file)
--- a/src/mainboard/tyan/s2885/Kconfig
+++ b/src/mainboard/tyan/s2885/Kconfig
@@ -35,10 +35,6 @@ config MAINBOARD_PART_NUMBER
        string
        default "S2885"
 
        string
        default "S2885"
 

-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
-       hex
-       default 0x2885
-

 config MAX_CPUS
        int
        default 4
 config MAX_CPUS
        int
        default 4

diff --git a/src/mainboard/tyan/s2885/devicetree.cb b/src/mainboard/tyan/s2885/devicetree.cb
index 0eb1b9e00292d382ef3339685e16df0f4799753f..fbb96807d62f3ee9a4484e1936044869db402b18 100644 (file)
--- 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
                 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
                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 31e99b6372b078066b838fe1b936d1e7e6d9fe97..2848380ef2dc3c3bf569a3aa2b155cc4b4106075 100644 (file)
--- a/src/mainboard/tyan/s2891/Kconfig
+++ b/src/mainboard/tyan/s2891/Kconfig
@@ -36,10 +36,6 @@ config MAINBOARD_PART_NUMBER
        string
        default "S2891"
 
        string
        default "S2891"
 

-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
-       hex
-       default 0x2891
-

 config MAX_CPUS
        int
        default 4
 config MAX_CPUS
        int
        default 4

diff --git a/src/mainboard/tyan/s2891/devicetree.cb b/src/mainboard/tyan/s2891/devicetree.cb
index 73034b10b99fc647bb2af08937e5d68b1e4da0c5..d79364058701b26cb1e7533b22e9244e4088f252 100644 (file)
--- 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
     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
     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 df3430b607ee4ba50b9f6c45575f433ff545eb17..88703f38b6e610bfddc9277d3f43378c8cd9287e 100644 (file)
--- a/src/mainboard/tyan/s2892/Kconfig
+++ b/src/mainboard/tyan/s2892/Kconfig
@@ -35,10 +35,6 @@ config MAINBOARD_PART_NUMBER
        string
        default "S2892"
 
        string
        default "S2892"
 

-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
-       hex
-       default 0x2892
-

 config MAX_CPUS
        int
        default 4
 config MAX_CPUS
        int
        default 4

diff --git a/src/mainboard/tyan/s2892/devicetree.cb b/src/mainboard/tyan/s2892/devicetree.cb
index b84c04115a7af90c1679af3ba8c7a788be7cda23..3b999ca42e64fe71d92be8b5ac3d83a1262429ae 100644 (file)
--- 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
     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
     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 0f8482be2ea5d3f33b616416c391981e8d3733cc..f35ea82774697cd05273afad25a6c10df3e00fd7 100644 (file)
--- a/src/mainboard/tyan/s2895/Kconfig
+++ b/src/mainboard/tyan/s2895/Kconfig
@@ -40,10 +40,6 @@ config MAINBOARD_PART_NUMBER
        string
        default "S2895"
 
        string
        default "S2895"
 

-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
-       hex
-       default 0x2895
-

 config MAX_CPUS
        int
        default 4
 config MAX_CPUS
        int
        default 4

diff --git a/src/mainboard/tyan/s2895/devicetree.cb b/src/mainboard/tyan/s2895/devicetree.cb
index 7841a0e43cef262b1b39dabffb3eb5bc92dd430f..7d7abc3dd1582ef4b85276577bf651c4efbfb163 100644 (file)
--- 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
     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
     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 466cb4a889149e3b115d348af2a358c7e31965e5..811e9a7a1b719311bb79c9400d27d63e39eb1783 100644 (file)
--- a/src/mainboard/tyan/s2912/Kconfig
+++ b/src/mainboard/tyan/s2912/Kconfig
@@ -79,10 +79,6 @@ config SERIAL_CPU_INIT
        bool
        default n
 
        bool
        default n
 

-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
-       hex
-       default 0x2912
-

 config IRQ_SLOT_COUNT
        int
        default 11
 config IRQ_SLOT_COUNT
        int
        default 11

diff --git a/src/mainboard/tyan/s2912/devicetree.cb b/src/mainboard/tyan/s2912/devicetree.cb
index 11c6a733bbc4712f1e121ec282e0bac957f46433..0ce4a4895ba2986b1d3b6f80305fecaf7d506df1 100644 (file)
--- 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
     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
     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 58cdb9c83ca52e88777757b650b4a7d0af78a306..d7d5114507911117655021bab3e82564752df5e7 100644 (file)
--- 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
 
        bool
        default n
 

-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
-       hex
-       default 0x2912
-

 config IRQ_SLOT_COUNT
        int
        default 11
 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 8373ffc34448fdd6addb4d0163d1ff6903983df7..43bdeb63deae04a25139c877274c82fb67640d7b 100644 (file)
--- 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
     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
     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 5147b979a60fda6c9b78a8c5665320404dd5eb2c..0b425b9c80ebdedb6393ea1a90ce53a27783ee5f 100644 (file)
--- a/src/mainboard/tyan/s4880/Kconfig
+++ b/src/mainboard/tyan/s4880/Kconfig
@@ -65,8 +65,4 @@ config IRQ_SLOT_COUNT
        int
        default 22
 
        int
        default 22
 

-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
-       hex
-       default 0x4880
-

 endif # BOARD_TYAN_S4880
 endif # BOARD_TYAN_S4880

diff --git a/src/mainboard/tyan/s4880/devicetree.cb b/src/mainboard/tyan/s4880/devicetree.cb
index cb342357a165bc832f97a58ab175782e776f7d0e..e1aa23a35ec04e950836a9c2739dc29db7f66b28 100644 (file)
--- 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
         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
                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 b0d8897af657b4134386fc5b2f424f4ecf27a964..3aa1690262277cfb791c550f7c3fc2c177a68c40 100644 (file)
--- a/src/mainboard/tyan/s4882/Kconfig
+++ b/src/mainboard/tyan/s4882/Kconfig
@@ -65,8 +65,4 @@ config IRQ_SLOT_COUNT
        int
        default 22
 
        int
        default 22
 

-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
-       hex
-       default 0x4882
-

 endif # BOARD_TYAN_S4882
 endif # BOARD_TYAN_S4882

diff --git a/src/mainboard/tyan/s4882/devicetree.cb b/src/mainboard/tyan/s4882/devicetree.cb
index d4a7017f43dc61d3f3ba8c12c13509be2146def0..767def9ac500dba772f1f65886a248ab6a1d4e5f 100644 (file)
--- 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
                 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
                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 f2722475638ce74cdc8bf2a79be2daced64edf6f..69805482d9373981d2c20be3b1cd3e471237b67e 100644 (file)
--- a/src/mainboard/via/Kconfig
+++ b/src/mainboard/via/Kconfig
@@ -32,8 +32,4 @@ config MAINBOARD_VENDOR
        string
        default "VIA"
 
        string
        default "VIA"
 

-config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
-       hex
-       default 0x1019
-

 endif # VENDOR_VIA
 endif # VENDOR_VIA

diff --git a/src/mainboard/via/pc2500e/Kconfig b/src/mainboard/via/pc2500e/Kconfig
index 3244ea9fc7d5c5de4c0783ca489a0b7f01931fc1..70aa8d75fb7be316fb1610bf8c0ee7a9065f18d8 100644 (file)
--- a/src/mainboard/via/pc2500e/Kconfig
+++ b/src/mainboard/via/pc2500e/Kconfig
@@ -26,14 +26,6 @@ config IRQ_SLOT_COUNT
        int
        default 10
 
        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"
 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 a891ef17c9d73aee496cb22a62c094fa1ad089a3..05ce8775323837e4894223e2254c8dbbfa03d062 100644 (file)
--- 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
 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
     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 2607d6cb4eeff63deb1855c2dc0aaebf747e4f43..e4a89d92bdb5e5775ec8d2fe7f5e98e0da958983 100644 (file)
--- a/src/mainboard/wyse/Kconfig
+++ b/src/mainboard/wyse/Kconfig
@@ -32,8 +32,4 @@ config MAINBOARD_VENDOR
        string
        default "Wyse"
 
        string
        default "Wyse"
 

-config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
-       hex
-       default 0x102d
-

 endif # VENDOR_WYSE
 endif # VENDOR_WYSE

diff --git a/src/mainboard/wyse/s50/devicetree.cb b/src/mainboard/wyse/s50/devicetree.cb
index b88bc46b12c439baec2943da52d0de405cfc54d5..504a5de6966e15937967cdf440d4fd06f3690d2a 100644 (file)
--- 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 
                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
                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 a8e8988d5772307e5038ddfc673fc9677bd6e5de..b32ebd64e3b39b7b4166ceeafc3bca88c223374f 100644 (file)
--- 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) {
        /* 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 = pci_read_config16(dev, PCI_COMMAND);