[coreboot] [commit] r6421 - in trunk/src: . devices mainboard/amd/bimini_fam10 mainboard/amd/dbm690t mainboard/amd/inagua mainboard/amd/mahogany mainboard/amd/mahogany_fam10 mainboard/amd/persimmon mainboard/...

Tue Mar 1 20:58:49 CET 2011

Author: svens
Date: Tue Mar  1 20:58:47 2011
New Revision: 6421
URL: https://tracker.coreboot.org/trac/coreboot/changeset/6421

Log:
Use subsystem id from devicetree.cb instead of Kconfig and move
all boards to the new config scheme.

Signed-off-by: Sven Schnelle <svens at stackframe.org>
Acked-by: Peter Stuge <peter at stuge.se>

Modified:
   trunk/src/Kconfig
   trunk/src/devices/pci_device.c
   trunk/src/mainboard/amd/bimini_fam10/Kconfig
   trunk/src/mainboard/amd/bimini_fam10/devicetree.cb
   trunk/src/mainboard/amd/dbm690t/Kconfig
   trunk/src/mainboard/amd/dbm690t/devicetree.cb
   trunk/src/mainboard/amd/inagua/Kconfig
   trunk/src/mainboard/amd/inagua/devicetree.cb
   trunk/src/mainboard/amd/mahogany/Kconfig
   trunk/src/mainboard/amd/mahogany/devicetree.cb
   trunk/src/mainboard/amd/mahogany_fam10/Kconfig
   trunk/src/mainboard/amd/mahogany_fam10/devicetree.cb
   trunk/src/mainboard/amd/persimmon/Kconfig
   trunk/src/mainboard/amd/persimmon/devicetree.cb
   trunk/src/mainboard/amd/pistachio/Kconfig
   trunk/src/mainboard/amd/pistachio/devicetree.cb
   trunk/src/mainboard/amd/serengeti_cheetah/Kconfig
   trunk/src/mainboard/amd/serengeti_cheetah/devicetree.cb
   trunk/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
   trunk/src/mainboard/amd/serengeti_cheetah_fam10/devicetree.cb
   trunk/src/mainboard/amd/tilapia_fam10/Kconfig
   trunk/src/mainboard/amd/tilapia_fam10/devicetree.cb
   trunk/src/mainboard/arima/hdama/Kconfig
   trunk/src/mainboard/arima/hdama/devicetree.cb
   trunk/src/mainboard/asrock/939a785gmh/Kconfig
   trunk/src/mainboard/asrock/939a785gmh/devicetree.cb
   trunk/src/mainboard/asrock/e350m1/Kconfig
   trunk/src/mainboard/asrock/e350m1/devicetree.cb
   trunk/src/mainboard/asus/Kconfig
   trunk/src/mainboard/asus/a8n_e/Kconfig
   trunk/src/mainboard/asus/a8n_e/devicetree.cb
   trunk/src/mainboard/asus/a8v-e_deluxe/Kconfig
   trunk/src/mainboard/asus/a8v-e_deluxe/devicetree.cb
   trunk/src/mainboard/asus/a8v-e_se/Kconfig
   trunk/src/mainboard/asus/a8v-e_se/devicetree.cb
   trunk/src/mainboard/asus/m2n-e/Kconfig
   trunk/src/mainboard/asus/m2n-e/devicetree.cb
   trunk/src/mainboard/asus/m2v-mx_se/Kconfig
   trunk/src/mainboard/asus/m2v-mx_se/devicetree.cb
   trunk/src/mainboard/asus/m2v/Kconfig
   trunk/src/mainboard/asus/m2v/devicetree.cb
   trunk/src/mainboard/asus/m4a78-em/Kconfig
   trunk/src/mainboard/asus/m4a78-em/devicetree.cb
   trunk/src/mainboard/asus/m4a785-m/Kconfig
   trunk/src/mainboard/asus/m4a785-m/devicetree.cb
   trunk/src/mainboard/broadcom/blast/Kconfig
   trunk/src/mainboard/broadcom/blast/devicetree.cb
   trunk/src/mainboard/dell/s1850/Kconfig
   trunk/src/mainboard/dell/s1850/devicetree.cb
   trunk/src/mainboard/gigabyte/ga_2761gxdk/Kconfig
   trunk/src/mainboard/gigabyte/ga_2761gxdk/devicetree.cb
   trunk/src/mainboard/gigabyte/m57sli/Kconfig
   trunk/src/mainboard/gigabyte/m57sli/devicetree.cb
   trunk/src/mainboard/gigabyte/ma785gmt/Kconfig
   trunk/src/mainboard/gigabyte/ma785gmt/devicetree.cb
   trunk/src/mainboard/gigabyte/ma78gm/Kconfig
   trunk/src/mainboard/gigabyte/ma78gm/devicetree.cb
   trunk/src/mainboard/hp/dl145_g1/Kconfig
   trunk/src/mainboard/hp/dl145_g1/devicetree.cb
   trunk/src/mainboard/iei/kino-780am2-fam10/Kconfig
   trunk/src/mainboard/intel/Kconfig
   trunk/src/mainboard/intel/d945gclf/Kconfig
   trunk/src/mainboard/intel/d945gclf/devicetree.cb
   trunk/src/mainboard/intel/jarrell/Kconfig
   trunk/src/mainboard/intel/jarrell/devicetree.cb
   trunk/src/mainboard/intel/mtarvon/Kconfig
   trunk/src/mainboard/intel/mtarvon/devicetree.cb
   trunk/src/mainboard/intel/truxton/Kconfig
   trunk/src/mainboard/intel/truxton/devicetree.cb
   trunk/src/mainboard/intel/xe7501devkit/Kconfig
   trunk/src/mainboard/intel/xe7501devkit/devicetree.cb
   trunk/src/mainboard/iwill/dk8_htx/Kconfig
   trunk/src/mainboard/iwill/dk8_htx/devicetree.cb
   trunk/src/mainboard/iwill/dk8s2/Kconfig
   trunk/src/mainboard/iwill/dk8s2/devicetree.cb
   trunk/src/mainboard/jetway/pa78vm5/Kconfig
   trunk/src/mainboard/jetway/pa78vm5/devicetree.cb
   trunk/src/mainboard/kontron/kt690/Kconfig
   trunk/src/mainboard/kontron/kt690/devicetree.cb
   trunk/src/mainboard/lenovo/x60/devicetree.cb
   trunk/src/mainboard/msi/Kconfig
   trunk/src/mainboard/msi/ms7135/Kconfig
   trunk/src/mainboard/msi/ms7135/devicetree.cb
   trunk/src/mainboard/msi/ms7260/Kconfig
   trunk/src/mainboard/msi/ms7260/devicetree.cb
   trunk/src/mainboard/msi/ms9185/Kconfig
   trunk/src/mainboard/msi/ms9185/devicetree.cb
   trunk/src/mainboard/msi/ms9282/Kconfig
   trunk/src/mainboard/msi/ms9282/devicetree.cb
   trunk/src/mainboard/msi/ms9652_fam10/Kconfig
   trunk/src/mainboard/msi/ms9652_fam10/devicetree.cb
   trunk/src/mainboard/newisys/khepri/Kconfig
   trunk/src/mainboard/newisys/khepri/devicetree.cb
   trunk/src/mainboard/nvidia/l1_2pvv/Kconfig
   trunk/src/mainboard/nvidia/l1_2pvv/devicetree.cb
   trunk/src/mainboard/roda/Kconfig
   trunk/src/mainboard/roda/rk886ex/Kconfig
   trunk/src/mainboard/roda/rk886ex/devicetree.cb
   trunk/src/mainboard/sunw/ultra40/Kconfig
   trunk/src/mainboard/sunw/ultra40/devicetree.cb
   trunk/src/mainboard/supermicro/Kconfig
   trunk/src/mainboard/supermicro/h8dme/Kconfig
   trunk/src/mainboard/supermicro/h8dme/devicetree.cb
   trunk/src/mainboard/supermicro/h8dmr/Kconfig
   trunk/src/mainboard/supermicro/h8dmr/devicetree.cb
   trunk/src/mainboard/supermicro/h8dmr_fam10/Kconfig
   trunk/src/mainboard/supermicro/h8dmr_fam10/devicetree.cb
   trunk/src/mainboard/supermicro/h8qme_fam10/Kconfig
   trunk/src/mainboard/supermicro/h8qme_fam10/devicetree.cb
   trunk/src/mainboard/supermicro/x6dai_g/Kconfig
   trunk/src/mainboard/supermicro/x6dai_g/devicetree.cb
   trunk/src/mainboard/supermicro/x6dhe_g/Kconfig
   trunk/src/mainboard/supermicro/x6dhe_g/devicetree.cb
   trunk/src/mainboard/supermicro/x6dhe_g2/Kconfig
   trunk/src/mainboard/supermicro/x6dhe_g2/devicetree.cb
   trunk/src/mainboard/supermicro/x6dhr_ig/Kconfig
   trunk/src/mainboard/supermicro/x6dhr_ig/devicetree.cb
   trunk/src/mainboard/supermicro/x6dhr_ig2/Kconfig
   trunk/src/mainboard/supermicro/x6dhr_ig2/devicetree.cb
   trunk/src/mainboard/technexion/tim5690/Kconfig
   trunk/src/mainboard/technexion/tim5690/devicetree.cb
   trunk/src/mainboard/technexion/tim8690/Kconfig
   trunk/src/mainboard/technexion/tim8690/devicetree.cb
   trunk/src/mainboard/tyan/Kconfig
   trunk/src/mainboard/tyan/s2735/Kconfig
   trunk/src/mainboard/tyan/s2735/devicetree.cb
   trunk/src/mainboard/tyan/s2850/Kconfig
   trunk/src/mainboard/tyan/s2850/devicetree.cb
   trunk/src/mainboard/tyan/s2875/Kconfig
   trunk/src/mainboard/tyan/s2875/devicetree.cb
   trunk/src/mainboard/tyan/s2880/Kconfig
   trunk/src/mainboard/tyan/s2880/devicetree.cb
   trunk/src/mainboard/tyan/s2881/Kconfig
   trunk/src/mainboard/tyan/s2881/devicetree.cb
   trunk/src/mainboard/tyan/s2882/Kconfig
   trunk/src/mainboard/tyan/s2882/devicetree.cb
   trunk/src/mainboard/tyan/s2885/Kconfig
   trunk/src/mainboard/tyan/s2885/devicetree.cb
   trunk/src/mainboard/tyan/s2891/Kconfig
   trunk/src/mainboard/tyan/s2891/devicetree.cb
   trunk/src/mainboard/tyan/s2892/Kconfig
   trunk/src/mainboard/tyan/s2892/devicetree.cb
   trunk/src/mainboard/tyan/s2895/Kconfig
   trunk/src/mainboard/tyan/s2895/devicetree.cb
   trunk/src/mainboard/tyan/s2912/Kconfig
   trunk/src/mainboard/tyan/s2912/devicetree.cb
   trunk/src/mainboard/tyan/s2912_fam10/Kconfig
   trunk/src/mainboard/tyan/s2912_fam10/devicetree.cb
   trunk/src/mainboard/tyan/s4880/Kconfig
   trunk/src/mainboard/tyan/s4880/devicetree.cb
   trunk/src/mainboard/tyan/s4882/Kconfig
   trunk/src/mainboard/tyan/s4882/devicetree.cb
   trunk/src/mainboard/via/Kconfig
   trunk/src/mainboard/via/pc2500e/Kconfig
   trunk/src/mainboard/via/pc2500e/devicetree.cb
   trunk/src/mainboard/wyse/Kconfig
   trunk/src/mainboard/wyse/s50/devicetree.cb
   trunk/src/southbridge/intel/i82801gx/pci.c

Modified: trunk/src/Kconfig
==============================================================================

--- trunk/src/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -137,13 +137,6 @@
 	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

Modified: trunk/src/devices/pci_device.c
==============================================================================
--- trunk/src/devices/pci_device.c	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/devices/pci_device.c	Tue Mar  1 20:58:47 2011	(r6421)
@@ -586,16 +586,6 @@
 	pci_write_config8(dev, PCI_CACHE_LINE_SIZE, 64 >> 2);
 }
 
-unsigned __attribute__((weak)) mainboard_pci_subsystem_vendor_id(__attribute__((unused)) struct device *dev)
-{
-		return CONFIG_MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID;
-}
-
-unsigned __attribute__((weak)) mainboard_pci_subsystem_device_id(__attribute__((unused)) struct device *dev)
-{
-		return CONFIG_MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID;
-}
-
 void pci_dev_enable_resources(struct device *dev)
 {
 	const struct pci_operations *ops;
@@ -604,12 +594,11 @@
 	/* 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;

Modified: trunk/src/mainboard/amd/bimini_fam10/Kconfig
==============================================================================
--- trunk/src/mainboard/amd/bimini_fam10/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/amd/bimini_fam10/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -91,14 +91,6 @@
 	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

Modified: trunk/src/mainboard/amd/bimini_fam10/devicetree.cb
==============================================================================
--- trunk/src/mainboard/amd/bimini_fam10/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/amd/bimini_fam10/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -6,6 +6,7 @@
 		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

Modified: trunk/src/mainboard/amd/dbm690t/Kconfig
==============================================================================
--- trunk/src/mainboard/amd/dbm690t/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/amd/dbm690t/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -59,12 +59,4 @@
 	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

Modified: trunk/src/mainboard/amd/dbm690t/devicetree.cb
==============================================================================
--- trunk/src/mainboard/amd/dbm690t/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/amd/dbm690t/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -15,6 +15,7 @@
 		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

Modified: trunk/src/mainboard/amd/inagua/Kconfig
==============================================================================
--- trunk/src/mainboard/amd/inagua/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/amd/inagua/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -118,14 +118,6 @@
         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

Modified: trunk/src/mainboard/amd/inagua/devicetree.cb
==============================================================================
--- trunk/src/mainboard/amd/inagua/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/amd/inagua/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -23,6 +23,7 @@
                 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

Modified: trunk/src/mainboard/amd/mahogany/Kconfig
==============================================================================
--- trunk/src/mainboard/amd/mahogany/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/amd/mahogany/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -73,12 +73,4 @@
 	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

Modified: trunk/src/mainboard/amd/mahogany/devicetree.cb
==============================================================================
--- trunk/src/mainboard/amd/mahogany/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/amd/mahogany/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -15,6 +15,7 @@
 		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

Modified: trunk/src/mainboard/amd/mahogany_fam10/Kconfig
==============================================================================
--- trunk/src/mainboard/amd/mahogany_fam10/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/amd/mahogany_fam10/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -79,14 +79,6 @@
 	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

Modified: trunk/src/mainboard/amd/mahogany_fam10/devicetree.cb
==============================================================================
--- trunk/src/mainboard/amd/mahogany_fam10/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/amd/mahogany_fam10/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -6,6 +6,7 @@
 		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

Modified: trunk/src/mainboard/amd/persimmon/Kconfig
==============================================================================
--- trunk/src/mainboard/amd/persimmon/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/amd/persimmon/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -118,14 +118,6 @@
         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

Modified: trunk/src/mainboard/amd/persimmon/devicetree.cb
==============================================================================
--- trunk/src/mainboard/amd/persimmon/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/amd/persimmon/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -23,6 +23,7 @@
                 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

Modified: trunk/src/mainboard/amd/pistachio/Kconfig
==============================================================================
--- trunk/src/mainboard/amd/pistachio/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/amd/pistachio/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -71,12 +71,4 @@
 	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

Modified: trunk/src/mainboard/amd/pistachio/devicetree.cb
==============================================================================
--- trunk/src/mainboard/amd/pistachio/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/amd/pistachio/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -15,6 +15,7 @@
 		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

Modified: trunk/src/mainboard/amd/serengeti_cheetah/Kconfig
==============================================================================
--- trunk/src/mainboard/amd/serengeti_cheetah/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/amd/serengeti_cheetah/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -82,14 +82,6 @@
 	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

Modified: trunk/src/mainboard/amd/serengeti_cheetah/devicetree.cb
==============================================================================
--- trunk/src/mainboard/amd/serengeti_cheetah/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/amd/serengeti_cheetah/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -5,6 +5,7 @@
                 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

Modified: trunk/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
==============================================================================
--- trunk/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -84,14 +84,6 @@
 	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

Modified: trunk/src/mainboard/amd/serengeti_cheetah_fam10/devicetree.cb
==============================================================================
--- trunk/src/mainboard/amd/serengeti_cheetah_fam10/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/amd/serengeti_cheetah_fam10/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -5,6 +5,7 @@
 		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

Modified: trunk/src/mainboard/amd/tilapia_fam10/Kconfig
==============================================================================
--- trunk/src/mainboard/amd/tilapia_fam10/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/amd/tilapia_fam10/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -79,14 +79,6 @@
 	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

Modified: trunk/src/mainboard/amd/tilapia_fam10/devicetree.cb
==============================================================================
--- trunk/src/mainboard/amd/tilapia_fam10/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/amd/tilapia_fam10/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -6,6 +6,7 @@
 		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

Modified: trunk/src/mainboard/arima/hdama/Kconfig
==============================================================================
--- trunk/src/mainboard/arima/hdama/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/arima/hdama/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -21,14 +21,6 @@
 	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

Modified: trunk/src/mainboard/arima/hdama/devicetree.cb
==============================================================================
--- trunk/src/mainboard/arima/hdama/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/arima/hdama/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -5,6 +5,7 @@
 		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

Modified: trunk/src/mainboard/asrock/939a785gmh/Kconfig
==============================================================================
--- trunk/src/mainboard/asrock/939a785gmh/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/asrock/939a785gmh/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -74,12 +74,4 @@
 	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

Modified: trunk/src/mainboard/asrock/939a785gmh/devicetree.cb
==============================================================================
--- trunk/src/mainboard/asrock/939a785gmh/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/asrock/939a785gmh/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -16,6 +16,7 @@
 		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

Modified: trunk/src/mainboard/asrock/e350m1/Kconfig
==============================================================================
--- trunk/src/mainboard/asrock/e350m1/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/asrock/e350m1/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -118,14 +118,6 @@
         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

Modified: trunk/src/mainboard/asrock/e350m1/devicetree.cb
==============================================================================
--- trunk/src/mainboard/asrock/e350m1/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/asrock/e350m1/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -23,6 +23,7 @@
                 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

Modified: trunk/src/mainboard/asus/Kconfig
==============================================================================
--- trunk/src/mainboard/asus/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/asus/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -77,8 +77,4 @@
 	string
 	default "ASUS"
 
-config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
-	hex
-	default 0x1043
-
 endif # VENDOR_ASUS

Modified: trunk/src/mainboard/asus/a8n_e/Kconfig
==============================================================================
--- trunk/src/mainboard/asus/a8n_e/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/asus/a8n_e/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -70,12 +70,4 @@
 	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

Modified: trunk/src/mainboard/asus/a8n_e/devicetree.cb
==============================================================================
--- trunk/src/mainboard/asus/a8n_e/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/asus/a8n_e/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -6,6 +6,7 @@
   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

Modified: trunk/src/mainboard/asus/a8v-e_deluxe/Kconfig
==============================================================================
--- trunk/src/mainboard/asus/a8v-e_deluxe/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/asus/a8v-e_deluxe/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -70,8 +70,4 @@
 	hex
 	default 0x0
 
-config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
-	hex
-	default 0x1043
-
 endif # BOARD_ASUS_A8V_E_DELUXE

Modified: trunk/src/mainboard/asus/a8v-e_deluxe/devicetree.cb
==============================================================================
--- trunk/src/mainboard/asus/a8v-e_deluxe/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/asus/a8v-e_deluxe/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -5,6 +5,7 @@
     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

Modified: trunk/src/mainboard/asus/a8v-e_se/Kconfig
==============================================================================
--- trunk/src/mainboard/asus/a8v-e_se/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/asus/a8v-e_se/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -70,8 +70,4 @@
 	hex
 	default 0x0
 
-config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
-	hex
-	default 0x1043
-
 endif # BOARD_ASUS_A8V_E_SE

Modified: trunk/src/mainboard/asus/a8v-e_se/devicetree.cb
==============================================================================
--- trunk/src/mainboard/asus/a8v-e_se/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/asus/a8v-e_se/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -5,6 +5,7 @@
     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

Modified: trunk/src/mainboard/asus/m2n-e/Kconfig
==============================================================================
--- trunk/src/mainboard/asus/m2n-e/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/asus/m2n-e/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -98,8 +98,4 @@
 	bool
 	default n
 
-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
-	hex
-	default 0x8239
-
 endif # BOARD_ASUS_M2N_E

Modified: trunk/src/mainboard/asus/m2n-e/devicetree.cb
==============================================================================
--- trunk/src/mainboard/asus/m2n-e/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/asus/m2n-e/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -25,6 +25,7 @@
     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

Modified: trunk/src/mainboard/asus/m2v-mx_se/Kconfig
==============================================================================
--- trunk/src/mainboard/asus/m2v-mx_se/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/asus/m2v-mx_se/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -89,8 +89,4 @@
 	hex
 	default 0x20
 
-config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
-	hex
-	default 0x1043
-
 endif # BOARD_ASUS_M2V_MX_SE

Modified: trunk/src/mainboard/asus/m2v-mx_se/devicetree.cb
==============================================================================
--- trunk/src/mainboard/asus/m2v-mx_se/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/asus/m2v-mx_se/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -5,6 +5,7 @@
     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

Modified: trunk/src/mainboard/asus/m2v/Kconfig
==============================================================================
--- trunk/src/mainboard/asus/m2v/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/asus/m2v/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -75,10 +75,6 @@
 	hex
 	default 0x0
 
-config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
-	hex
-	default 0x1043
-
 config IRQ_SLOT_COUNT
 	int
 	default 14

Modified: trunk/src/mainboard/asus/m2v/devicetree.cb
==============================================================================
--- trunk/src/mainboard/asus/m2v/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/asus/m2v/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -5,6 +5,7 @@
     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

Modified: trunk/src/mainboard/asus/m4a78-em/Kconfig
==============================================================================
--- trunk/src/mainboard/asus/m4a78-em/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/asus/m4a78-em/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -77,14 +77,6 @@
 	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

Modified: trunk/src/mainboard/asus/m4a78-em/devicetree.cb
==============================================================================
--- trunk/src/mainboard/asus/m4a78-em/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/asus/m4a78-em/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -5,6 +5,7 @@
 		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

Modified: trunk/src/mainboard/asus/m4a785-m/Kconfig
==============================================================================
--- trunk/src/mainboard/asus/m4a785-m/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/asus/m4a785-m/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -78,14 +78,6 @@
 	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

Modified: trunk/src/mainboard/asus/m4a785-m/devicetree.cb
==============================================================================
--- trunk/src/mainboard/asus/m4a785-m/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/asus/m4a785-m/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -5,6 +5,7 @@
 		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

Modified: trunk/src/mainboard/broadcom/blast/Kconfig
==============================================================================
--- trunk/src/mainboard/broadcom/blast/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/broadcom/blast/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -70,12 +70,4 @@
 	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

Modified: trunk/src/mainboard/broadcom/blast/devicetree.cb
==============================================================================
--- trunk/src/mainboard/broadcom/blast/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/broadcom/blast/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -5,6 +5,7 @@
                 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

Modified: trunk/src/mainboard/dell/s1850/Kconfig
==============================================================================
--- trunk/src/mainboard/dell/s1850/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/dell/s1850/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -26,14 +26,6 @@
 	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

Modified: trunk/src/mainboard/dell/s1850/devicetree.cb
==============================================================================
--- trunk/src/mainboard/dell/s1850/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/dell/s1850/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -1,5 +1,6 @@
 chip northbridge/intel/e7520 # mch
 	device pci_domain 0 on
+		subsystemid 0x15d9 0x5580 inherit
 		chip southbridge/intel/i82801ex # i82801er
 			# USB ports
 			device pci 1d.0 on end

Modified: trunk/src/mainboard/gigabyte/ga_2761gxdk/Kconfig
==============================================================================
--- trunk/src/mainboard/gigabyte/ga_2761gxdk/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/gigabyte/ga_2761gxdk/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -78,14 +78,6 @@
 	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

Modified: trunk/src/mainboard/gigabyte/ga_2761gxdk/devicetree.cb
==============================================================================
--- trunk/src/mainboard/gigabyte/ga_2761gxdk/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/gigabyte/ga_2761gxdk/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -5,6 +5,7 @@
                 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

Modified: trunk/src/mainboard/gigabyte/m57sli/Kconfig
==============================================================================
--- trunk/src/mainboard/gigabyte/m57sli/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/gigabyte/m57sli/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -82,14 +82,6 @@
 	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

Modified: trunk/src/mainboard/gigabyte/m57sli/devicetree.cb
==============================================================================
--- trunk/src/mainboard/gigabyte/m57sli/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/gigabyte/m57sli/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -5,6 +5,7 @@
     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

Modified: trunk/src/mainboard/gigabyte/ma785gmt/Kconfig
==============================================================================
--- trunk/src/mainboard/gigabyte/ma785gmt/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/gigabyte/ma785gmt/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -79,14 +79,6 @@
 	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

Modified: trunk/src/mainboard/gigabyte/ma785gmt/devicetree.cb
==============================================================================
--- trunk/src/mainboard/gigabyte/ma785gmt/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/gigabyte/ma785gmt/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -6,6 +6,7 @@
 		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

Modified: trunk/src/mainboard/gigabyte/ma78gm/Kconfig
==============================================================================
--- trunk/src/mainboard/gigabyte/ma78gm/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/gigabyte/ma78gm/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -79,14 +79,6 @@
 	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

Modified: trunk/src/mainboard/gigabyte/ma78gm/devicetree.cb
==============================================================================
--- trunk/src/mainboard/gigabyte/ma78gm/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/gigabyte/ma78gm/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -6,6 +6,7 @@
 		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

Modified: trunk/src/mainboard/hp/dl145_g1/Kconfig
==============================================================================
--- trunk/src/mainboard/hp/dl145_g1/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/hp/dl145_g1/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -34,14 +34,6 @@
 	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

Modified: trunk/src/mainboard/hp/dl145_g1/devicetree.cb
==============================================================================
--- trunk/src/mainboard/hp/dl145_g1/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/hp/dl145_g1/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -5,6 +5,7 @@
     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

Modified: trunk/src/mainboard/iei/kino-780am2-fam10/Kconfig
==============================================================================
--- trunk/src/mainboard/iei/kino-780am2-fam10/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/iei/kino-780am2-fam10/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -79,14 +79,6 @@
 	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

Modified: trunk/src/mainboard/intel/Kconfig
==============================================================================
--- trunk/src/mainboard/intel/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/intel/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -32,8 +32,4 @@
 	string
 	default "Intel"
 
-config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
-	hex
-	default 0x8086
-
 endif # VENDOR_INTEL

Modified: trunk/src/mainboard/intel/d945gclf/Kconfig
==============================================================================
--- trunk/src/mainboard/intel/d945gclf/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/intel/d945gclf/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -49,10 +49,6 @@
 	string
 	default "D945GCLF"
 
-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
-	hex
-	default 0x464C
-
 config MMCONF_BASE_ADDRESS
 	hex
 	default 0xf0000000

Modified: trunk/src/mainboard/intel/d945gclf/devicetree.cb
==============================================================================
--- trunk/src/mainboard/intel/d945gclf/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/intel/d945gclf/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -26,6 +26,7 @@
         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

Modified: trunk/src/mainboard/intel/jarrell/Kconfig
==============================================================================
--- trunk/src/mainboard/intel/jarrell/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/intel/jarrell/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -35,14 +35,6 @@
 	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

Modified: trunk/src/mainboard/intel/jarrell/devicetree.cb
==============================================================================
--- trunk/src/mainboard/intel/jarrell/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/intel/jarrell/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -1,5 +1,6 @@
 chip northbridge/intel/e7520
 	device pci_domain 0 on
+		subsystemid 0x8086 0x1079 inherit
 		device pci 00.0 on end
 		device pci 00.1 on end
 		device pci 01.0 on end

Modified: trunk/src/mainboard/intel/mtarvon/Kconfig
==============================================================================
--- trunk/src/mainboard/intel/mtarvon/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/intel/mtarvon/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -25,14 +25,6 @@
 	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

Modified: trunk/src/mainboard/intel/mtarvon/devicetree.cb
==============================================================================
--- trunk/src/mainboard/intel/mtarvon/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/intel/mtarvon/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -1,5 +1,6 @@
 chip northbridge/intel/i3100
         device pci_domain 0 on
+                subsystemid 0x8086 0x2680 inherit
                 device pci 00.0 on end # IMCH
                 device pci 00.1 on end # IMCH error status
                 device pci 01.0 on end # IMCH EDMA engine

Modified: trunk/src/mainboard/intel/truxton/Kconfig
==============================================================================
--- trunk/src/mainboard/intel/truxton/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/intel/truxton/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -27,14 +27,6 @@
 	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

Modified: trunk/src/mainboard/intel/truxton/devicetree.cb
==============================================================================
--- trunk/src/mainboard/intel/truxton/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/intel/truxton/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -1,5 +1,6 @@
 chip northbridge/intel/i3100
         device pci_domain 0 on
+                subsystemid 0x8086 0x2680 inherit
                 device pci 00.0 on end # IMCH
                 device pci 00.1 on end # IMCH error status
                 device pci 01.0 on end # IMCH EDMA engine

Modified: trunk/src/mainboard/intel/xe7501devkit/Kconfig
==============================================================================
--- trunk/src/mainboard/intel/xe7501devkit/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/intel/xe7501devkit/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -37,12 +37,4 @@
 	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

Modified: trunk/src/mainboard/intel/xe7501devkit/devicetree.cb
==============================================================================
--- trunk/src/mainboard/intel/xe7501devkit/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/intel/xe7501devkit/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -1,5 +1,6 @@
 chip northbridge/intel/e7501
 	device pci_domain 0 on
+		subsystemid 0x8086 0x2480 inherit
 		device pci 0.0 on end # Chipset host controller
 		device pci 0.1 on end # Host RASUM controller
 		device pci 2.0 on # Hub interface B

Modified: trunk/src/mainboard/iwill/dk8_htx/Kconfig
==============================================================================
--- trunk/src/mainboard/iwill/dk8_htx/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/iwill/dk8_htx/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -63,14 +63,6 @@
 	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

Modified: trunk/src/mainboard/iwill/dk8_htx/devicetree.cb
==============================================================================
--- trunk/src/mainboard/iwill/dk8_htx/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/iwill/dk8_htx/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -5,6 +5,7 @@
                 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

Modified: trunk/src/mainboard/iwill/dk8s2/Kconfig
==============================================================================
--- trunk/src/mainboard/iwill/dk8s2/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/iwill/dk8s2/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -60,12 +60,4 @@
 	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

Modified: trunk/src/mainboard/iwill/dk8s2/devicetree.cb
==============================================================================
--- trunk/src/mainboard/iwill/dk8s2/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/iwill/dk8s2/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -5,6 +5,7 @@
 		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

Modified: trunk/src/mainboard/jetway/pa78vm5/Kconfig
==============================================================================
--- trunk/src/mainboard/jetway/pa78vm5/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/jetway/pa78vm5/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -79,14 +79,6 @@
 	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

Modified: trunk/src/mainboard/jetway/pa78vm5/devicetree.cb
==============================================================================
--- trunk/src/mainboard/jetway/pa78vm5/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/jetway/pa78vm5/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -6,6 +6,7 @@
 		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

Modified: trunk/src/mainboard/kontron/kt690/Kconfig
==============================================================================
--- trunk/src/mainboard/kontron/kt690/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/kontron/kt690/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -28,14 +28,6 @@
 	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

Modified: trunk/src/mainboard/kontron/kt690/devicetree.cb
==============================================================================
--- trunk/src/mainboard/kontron/kt690/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/kontron/kt690/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -15,6 +15,7 @@
 		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

Modified: trunk/src/mainboard/lenovo/x60/devicetree.cb
==============================================================================
--- trunk/src/mainboard/lenovo/x60/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/lenovo/x60/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -22,17 +22,23 @@
 
 chip northbridge/intel/i945
 
-        device lapic_cluster 0 on
-                chip cpu/intel/socket_mFCPGA478
-                        device lapic 0 on end
-                end
-        end
-
-        device pci_domain 0 on
-                device pci 00.0 on end # host bridge
-		device pci 02.0 on end # vga controller
-		device pci 02.1 on end # display controller
-                chip southbridge/intel/i82801gx
+	device lapic_cluster 0 on
+		chip cpu/intel/socket_mFCPGA478
+			device lapic 0 on end
+		end
+	end
+
+	device pci_domain 0 on
+		device pci 00.0 on # Host bridge
+			subsystemid 0x17aa 0x2017
+		end
+		device pci 02.0 on # VGA controller
+			subsystemid 0x17aa 0x201a
+		end
+		device pci 02.1 on # display controller
+			subsystemid 0x17aa 0x201a
+		end
+		chip southbridge/intel/i82801gx
 			register "pirqa_routing" = "0x0b"
 			register "pirqb_routing" = "0x0b"
 			register "pirqc_routing" = "0x0b"
@@ -46,23 +52,36 @@
 			#  0 No effect (default)
 			#  1 SMI# (if corresponding ALT_GPI_SMI_EN bit is also set)
 			#  2 SCI (if corresponding GPIO_EN bit is also set)
-                        register "gpi13_routing" = "2"
-                        register "gpi12_routing" = "2"
-                        register "gpi8_routing" = "2"
+			register "gpi13_routing" = "2"
+			register "gpi12_routing" = "2"
+			register "gpi8_routing" = "2"
 
-                        register "sata_ahci" = "0x0"
+			register "sata_ahci" = "0x0"
 
 			register "gpe0_en" = "0x11000006"
 
-			device pci 1b.0 on end # Audio Controller
+			device pci 1b.0 on # Audio Cnotroller
+				subsystemid 0x17aa 0x2010
+			end
 			device pci 1c.0 on end # Ethernet
 			device pci 1c.1 on end # Atheros WLAN
-			device pci 1d.0 on end # USB UHCI
-			device pci 1d.1 on end # USB UHCI
-			device pci 1d.2 on end # USB UHCI
-			device pci 1d.3 on end # USB UHCI
-			device pci 1d.7 on end # USB2 EHCI
+			device pci 1d.0 on # USB UHCI
+				subsystemid 0x17aa 0x200a
+			end
+			device pci 1d.1 on # USB UHCI
+				subsystemid 0x17aa 0x200a
+			end
+			device pci 1d.2 on # USB UHCI
+				subsystemid 0x17aa 0x200a
+			end
+			device pci 1d.3 on # USB UHCI
+				subsystemid 0x17aa 0x200a
+			end
+			device pci 1d.7 on # USB2 EHCI
+				subsystemid 0x17aa 0x200b
+			end
 			device pci 1f.0 on # PCI-LPC bridge
+				subsystemid 0x17aa 0x2009
 				chip ec/lenovo/pmh7
 					device pnp ff.1 on # dummy
 					end
@@ -120,9 +139,15 @@
 					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

Modified: trunk/src/mainboard/msi/Kconfig
==============================================================================
--- trunk/src/mainboard/msi/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/msi/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -56,8 +56,4 @@
 	string
 	default "MSI"
 
-config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
-	hex
-	default 0x1462
-
 endif # VENDOR_MSI

Modified: trunk/src/mainboard/msi/ms7135/Kconfig
==============================================================================
--- trunk/src/mainboard/msi/ms7135/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/msi/ms7135/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -34,10 +34,6 @@
 	string
 	default "MS-7135"
 
-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
-	hex
-	default 0x7135
-
 config MAX_CPUS
 	int
 	default 2

Modified: trunk/src/mainboard/msi/ms7135/devicetree.cb
==============================================================================
--- trunk/src/mainboard/msi/ms7135/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/msi/ms7135/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -6,6 +6,7 @@
   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

Modified: trunk/src/mainboard/msi/ms7260/Kconfig
==============================================================================
--- trunk/src/mainboard/msi/ms7260/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/msi/ms7260/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -80,14 +80,6 @@
 	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

Modified: trunk/src/mainboard/msi/ms7260/devicetree.cb
==============================================================================
--- trunk/src/mainboard/msi/ms7260/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/msi/ms7260/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -5,6 +5,7 @@
     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

Modified: trunk/src/mainboard/msi/ms9185/Kconfig
==============================================================================
--- trunk/src/mainboard/msi/ms9185/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/msi/ms9185/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -71,12 +71,4 @@
 	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

Modified: trunk/src/mainboard/msi/ms9185/devicetree.cb
==============================================================================
--- trunk/src/mainboard/msi/ms9185/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/msi/ms9185/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -5,6 +5,7 @@
                 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

Modified: trunk/src/mainboard/msi/ms9282/Kconfig
==============================================================================
--- trunk/src/mainboard/msi/ms9282/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/msi/ms9282/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -72,14 +72,6 @@
 	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

Modified: trunk/src/mainboard/msi/ms9282/devicetree.cb
==============================================================================
--- trunk/src/mainboard/msi/ms9282/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/msi/ms9282/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -5,6 +5,7 @@
     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

Modified: trunk/src/mainboard/msi/ms9652_fam10/Kconfig
==============================================================================
--- trunk/src/mainboard/msi/ms9652_fam10/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/msi/ms9652_fam10/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -87,14 +87,6 @@
 	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

Modified: trunk/src/mainboard/msi/ms9652_fam10/devicetree.cb
==============================================================================
--- trunk/src/mainboard/msi/ms9652_fam10/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/msi/ms9652_fam10/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -28,6 +28,7 @@
     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

Modified: trunk/src/mainboard/newisys/khepri/Kconfig
==============================================================================
--- trunk/src/mainboard/newisys/khepri/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/newisys/khepri/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -69,12 +69,4 @@
 	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

Modified: trunk/src/mainboard/newisys/khepri/devicetree.cb
==============================================================================
--- trunk/src/mainboard/newisys/khepri/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/newisys/khepri/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -6,6 +6,7 @@
 	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

Modified: trunk/src/mainboard/nvidia/l1_2pvv/Kconfig
==============================================================================
--- trunk/src/mainboard/nvidia/l1_2pvv/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/nvidia/l1_2pvv/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -84,14 +84,6 @@
 	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

Modified: trunk/src/mainboard/nvidia/l1_2pvv/devicetree.cb
==============================================================================
--- trunk/src/mainboard/nvidia/l1_2pvv/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/nvidia/l1_2pvv/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -5,6 +5,7 @@
     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

Modified: trunk/src/mainboard/roda/Kconfig
==============================================================================
--- trunk/src/mainboard/roda/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/roda/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -14,8 +14,4 @@
 	string
 	default "Roda"
 
-config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
-	hex
-	default 0x4352
-
 endif # VENDOR_RODA

Modified: trunk/src/mainboard/roda/rk886ex/Kconfig
==============================================================================
--- trunk/src/mainboard/roda/rk886ex/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/roda/rk886ex/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -46,10 +46,6 @@
 	int
 	default 2
 
-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
-	hex
-	default 0x6886
-
 config MAXIMUM_SUPPORTED_FREQUENCY
 	int
 	default 400

Modified: trunk/src/mainboard/roda/rk886ex/devicetree.cb
==============================================================================
--- trunk/src/mainboard/roda/rk886ex/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/roda/rk886ex/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -28,6 +28,7 @@
         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

Modified: trunk/src/mainboard/sunw/ultra40/Kconfig
==============================================================================
--- trunk/src/mainboard/sunw/ultra40/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/sunw/ultra40/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -75,12 +75,4 @@
 	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

Modified: trunk/src/mainboard/sunw/ultra40/devicetree.cb
==============================================================================
--- trunk/src/mainboard/sunw/ultra40/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/sunw/ultra40/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -5,6 +5,7 @@
     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

Modified: trunk/src/mainboard/supermicro/Kconfig
==============================================================================
--- trunk/src/mainboard/supermicro/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/supermicro/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -38,8 +38,4 @@
 	string
 	default "Supermicro"
 
-config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
-	hex
-	default 0x15d9
-
 endif # VENDOR_SUPERMICRO

Modified: trunk/src/mainboard/supermicro/h8dme/Kconfig
==============================================================================
--- trunk/src/mainboard/supermicro/h8dme/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/supermicro/h8dme/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -81,12 +81,4 @@
 	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

Modified: trunk/src/mainboard/supermicro/h8dme/devicetree.cb
==============================================================================
--- trunk/src/mainboard/supermicro/h8dme/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/supermicro/h8dme/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -5,6 +5,7 @@
     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

Modified: trunk/src/mainboard/supermicro/h8dmr/Kconfig
==============================================================================
--- trunk/src/mainboard/supermicro/h8dmr/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/supermicro/h8dmr/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -80,12 +80,4 @@
 	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

Modified: trunk/src/mainboard/supermicro/h8dmr/devicetree.cb
==============================================================================
--- trunk/src/mainboard/supermicro/h8dmr/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/supermicro/h8dmr/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -5,6 +5,7 @@
     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

Modified: trunk/src/mainboard/supermicro/h8dmr_fam10/Kconfig
==============================================================================
--- trunk/src/mainboard/supermicro/h8dmr_fam10/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/supermicro/h8dmr_fam10/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -100,8 +100,4 @@
 	bool
 	default n
 
-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
-	hex
-	default 0x1511
-
 endif # BOARD_SUPERMICRO_H8DMR_FAM10

Modified: trunk/src/mainboard/supermicro/h8dmr_fam10/devicetree.cb
==============================================================================
--- trunk/src/mainboard/supermicro/h8dmr_fam10/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/supermicro/h8dmr_fam10/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -5,6 +5,7 @@
     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

Modified: trunk/src/mainboard/supermicro/h8qme_fam10/Kconfig
==============================================================================
--- trunk/src/mainboard/supermicro/h8qme_fam10/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/supermicro/h8qme_fam10/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -99,10 +99,6 @@
 	bool
 	default y
 
-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
-	hex
-	default 0x1511
-
 config STACK_SIZE
 	hex
 	default 0x10000

Modified: trunk/src/mainboard/supermicro/h8qme_fam10/devicetree.cb
==============================================================================
--- trunk/src/mainboard/supermicro/h8qme_fam10/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/supermicro/h8qme_fam10/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -5,6 +5,7 @@
     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

Modified: trunk/src/mainboard/supermicro/x6dai_g/Kconfig
==============================================================================
--- trunk/src/mainboard/supermicro/x6dai_g/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/supermicro/x6dai_g/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -23,14 +23,6 @@
 	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

Modified: trunk/src/mainboard/supermicro/x6dai_g/devicetree.cb
==============================================================================
--- trunk/src/mainboard/supermicro/x6dai_g/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/supermicro/x6dai_g/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -1,5 +1,6 @@
 chip northbridge/intel/e7525 # mch
 	device pci_domain 0 on
+		subsystemid 0x15d9 0x6780 inherit
 		chip southbridge/intel/esb6300  # esb6300
 			register "pirq_a_d" = "0x0b0a0a05"
 			register "pirq_e_h" = "0x0a0b0c80"

Modified: trunk/src/mainboard/supermicro/x6dhe_g/Kconfig
==============================================================================
--- trunk/src/mainboard/supermicro/x6dhe_g/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/supermicro/x6dhe_g/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -25,14 +25,6 @@
 	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

Modified: trunk/src/mainboard/supermicro/x6dhe_g/devicetree.cb
==============================================================================
--- trunk/src/mainboard/supermicro/x6dhe_g/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/supermicro/x6dhe_g/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -6,6 +6,7 @@
 		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"

Modified: trunk/src/mainboard/supermicro/x6dhe_g2/Kconfig
==============================================================================
--- trunk/src/mainboard/supermicro/x6dhe_g2/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/supermicro/x6dhe_g2/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -26,14 +26,6 @@
 	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

Modified: trunk/src/mainboard/supermicro/x6dhe_g2/devicetree.cb
==============================================================================
--- trunk/src/mainboard/supermicro/x6dhe_g2/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/supermicro/x6dhe_g2/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -6,6 +6,7 @@
 		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"

Modified: trunk/src/mainboard/supermicro/x6dhr_ig/Kconfig
==============================================================================
--- trunk/src/mainboard/supermicro/x6dhr_ig/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/supermicro/x6dhr_ig/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -25,14 +25,6 @@
 	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

Modified: trunk/src/mainboard/supermicro/x6dhr_ig/devicetree.cb
==============================================================================
--- trunk/src/mainboard/supermicro/x6dhr_ig/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/supermicro/x6dhr_ig/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -1,5 +1,6 @@
 chip northbridge/intel/e7520 # mch
 	device pci_domain 0 on
+		subsystemid 0x15d9 0x5580 inherit
 		chip southbridge/intel/i82801ex # i82801er
 			# USB ports
 			device pci 1d.0 on end

Modified: trunk/src/mainboard/supermicro/x6dhr_ig2/Kconfig
==============================================================================
--- trunk/src/mainboard/supermicro/x6dhr_ig2/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/supermicro/x6dhr_ig2/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -25,14 +25,6 @@
 	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

Modified: trunk/src/mainboard/supermicro/x6dhr_ig2/devicetree.cb
==============================================================================
--- trunk/src/mainboard/supermicro/x6dhr_ig2/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/supermicro/x6dhr_ig2/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -1,5 +1,6 @@
 chip northbridge/intel/e7520 # mch
 	device pci_domain 0 on
+		subsystemid 0x15d9 0x5580 inherit
 		chip southbridge/intel/i82801ex # i82801er
 			# USB ports
 			device pci 1d.0 on end

Modified: trunk/src/mainboard/technexion/tim5690/Kconfig
==============================================================================
--- trunk/src/mainboard/technexion/tim5690/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/technexion/tim5690/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -60,14 +60,6 @@
 	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

Modified: trunk/src/mainboard/technexion/tim5690/devicetree.cb
==============================================================================
--- trunk/src/mainboard/technexion/tim5690/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/technexion/tim5690/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -15,6 +15,7 @@
 		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

Modified: trunk/src/mainboard/technexion/tim8690/Kconfig
==============================================================================
--- trunk/src/mainboard/technexion/tim8690/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/technexion/tim8690/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -59,12 +59,4 @@
 	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

Modified: trunk/src/mainboard/technexion/tim8690/devicetree.cb
==============================================================================
--- trunk/src/mainboard/technexion/tim8690/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/technexion/tim8690/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -15,6 +15,7 @@
 		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

Modified: trunk/src/mainboard/tyan/Kconfig
==============================================================================
--- trunk/src/mainboard/tyan/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/tyan/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -74,8 +74,4 @@
 	string
 	default "Tyan"
 
-config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
-	hex
-	default 0x10f1
-
 endif # VENDOR_TYAN

Modified: trunk/src/mainboard/tyan/s2735/Kconfig
==============================================================================
--- trunk/src/mainboard/tyan/s2735/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/tyan/s2735/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -45,8 +45,4 @@
 	int
 	default 2
 
-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
-	hex
-	default 0x2735
-
 endif # BOARD_TYAN_S2735

Modified: trunk/src/mainboard/tyan/s2735/devicetree.cb
==============================================================================
--- trunk/src/mainboard/tyan/s2735/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/tyan/s2735/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -1,5 +1,6 @@
 chip northbridge/intel/e7501
         device pci_domain 0 on
+		subsystemid 0x10f1 0x2735 inherit
 		device pci 0.0 on end
         	device pci 0.1 on end
         	device pci 2.0 on

Modified: trunk/src/mainboard/tyan/s2850/Kconfig
==============================================================================
--- trunk/src/mainboard/tyan/s2850/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/tyan/s2850/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -23,10 +23,6 @@
 	string
 	default "S2850"
 
-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
-	hex
-	default 0x2850
-
 config MAX_CPUS
 	int
 	default 2

Modified: trunk/src/mainboard/tyan/s2850/devicetree.cb
==============================================================================
--- trunk/src/mainboard/tyan/s2850/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/tyan/s2850/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -5,6 +5,7 @@
                 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

Modified: trunk/src/mainboard/tyan/s2875/Kconfig
==============================================================================
--- trunk/src/mainboard/tyan/s2875/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/tyan/s2875/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -25,10 +25,6 @@
 	string
 	default "S2875"
 
-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
-	hex
-	default 0x2875
-
 config MAX_CPUS
 	int
 	default 4

Modified: trunk/src/mainboard/tyan/s2875/devicetree.cb
==============================================================================
--- trunk/src/mainboard/tyan/s2875/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/tyan/s2875/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -5,6 +5,7 @@
                 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

Modified: trunk/src/mainboard/tyan/s2880/Kconfig
==============================================================================
--- trunk/src/mainboard/tyan/s2880/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/tyan/s2880/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -33,10 +33,6 @@
 	string
 	default "S2880"
 
-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
-	hex
-	default 0x2880
-
 config MAX_CPUS
 	int
 	default 2

Modified: trunk/src/mainboard/tyan/s2880/devicetree.cb
==============================================================================
--- trunk/src/mainboard/tyan/s2880/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/tyan/s2880/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -5,6 +5,7 @@
                 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

Modified: trunk/src/mainboard/tyan/s2881/Kconfig
==============================================================================
--- trunk/src/mainboard/tyan/s2881/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/tyan/s2881/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -35,10 +35,6 @@
 	string
 	default "S2881"
 
-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
-	hex
-	default 0x2881
-
 config MAX_CPUS
 	int
 	default 4

Modified: trunk/src/mainboard/tyan/s2881/devicetree.cb
==============================================================================
--- trunk/src/mainboard/tyan/s2881/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/tyan/s2881/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -5,6 +5,7 @@
     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

Modified: trunk/src/mainboard/tyan/s2882/Kconfig
==============================================================================
--- trunk/src/mainboard/tyan/s2882/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/tyan/s2882/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -34,10 +34,6 @@
 	string
 	default "S2882"
 
-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
-	hex
-	default 0x2882
-
 config MAX_CPUS
 	int
 	default 4

Modified: trunk/src/mainboard/tyan/s2882/devicetree.cb
==============================================================================
--- trunk/src/mainboard/tyan/s2882/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/tyan/s2882/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -6,6 +6,7 @@
         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

Modified: trunk/src/mainboard/tyan/s2885/Kconfig
==============================================================================
--- trunk/src/mainboard/tyan/s2885/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/tyan/s2885/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -35,10 +35,6 @@
 	string
 	default "S2885"
 
-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
-	hex
-	default 0x2885
-
 config MAX_CPUS
 	int
 	default 4

Modified: trunk/src/mainboard/tyan/s2885/devicetree.cb
==============================================================================
--- trunk/src/mainboard/tyan/s2885/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/tyan/s2885/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -5,6 +5,7 @@
                 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

Modified: trunk/src/mainboard/tyan/s2891/Kconfig
==============================================================================
--- trunk/src/mainboard/tyan/s2891/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/tyan/s2891/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -36,10 +36,6 @@
 	string
 	default "S2891"
 
-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
-	hex
-	default 0x2891
-
 config MAX_CPUS
 	int
 	default 4

Modified: trunk/src/mainboard/tyan/s2891/devicetree.cb
==============================================================================
--- trunk/src/mainboard/tyan/s2891/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/tyan/s2891/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -5,6 +5,7 @@
     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

Modified: trunk/src/mainboard/tyan/s2892/Kconfig
==============================================================================
--- trunk/src/mainboard/tyan/s2892/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/tyan/s2892/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -35,10 +35,6 @@
 	string
 	default "S2892"
 
-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
-	hex
-	default 0x2892
-
 config MAX_CPUS
 	int
 	default 4

Modified: trunk/src/mainboard/tyan/s2892/devicetree.cb
==============================================================================
--- trunk/src/mainboard/tyan/s2892/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/tyan/s2892/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -5,6 +5,7 @@
     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

Modified: trunk/src/mainboard/tyan/s2895/Kconfig
==============================================================================
--- trunk/src/mainboard/tyan/s2895/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/tyan/s2895/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -40,10 +40,6 @@
 	string
 	default "S2895"
 
-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
-	hex
-	default 0x2895
-
 config MAX_CPUS
 	int
 	default 4

Modified: trunk/src/mainboard/tyan/s2895/devicetree.cb
==============================================================================
--- trunk/src/mainboard/tyan/s2895/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/tyan/s2895/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -5,6 +5,7 @@
     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

Modified: trunk/src/mainboard/tyan/s2912/Kconfig
==============================================================================
--- trunk/src/mainboard/tyan/s2912/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/tyan/s2912/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -79,10 +79,6 @@
 	bool
 	default n
 
-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
-	hex
-	default 0x2912
-
 config IRQ_SLOT_COUNT
 	int
 	default 11

Modified: trunk/src/mainboard/tyan/s2912/devicetree.cb
==============================================================================
--- trunk/src/mainboard/tyan/s2912/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/tyan/s2912/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -5,6 +5,7 @@
     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

Modified: trunk/src/mainboard/tyan/s2912_fam10/Kconfig
==============================================================================
--- trunk/src/mainboard/tyan/s2912_fam10/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/tyan/s2912_fam10/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -80,10 +80,6 @@
 	bool
 	default n
 
-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
-	hex
-	default 0x2912
-
 config IRQ_SLOT_COUNT
 	int
 	default 11

Modified: trunk/src/mainboard/tyan/s2912_fam10/devicetree.cb
==============================================================================
--- trunk/src/mainboard/tyan/s2912_fam10/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/tyan/s2912_fam10/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -5,6 +5,7 @@
     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

Modified: trunk/src/mainboard/tyan/s4880/Kconfig
==============================================================================
--- trunk/src/mainboard/tyan/s4880/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/tyan/s4880/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -65,8 +65,4 @@
 	int
 	default 22
 
-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
-	hex
-	default 0x4880
-
 endif # BOARD_TYAN_S4880

Modified: trunk/src/mainboard/tyan/s4880/devicetree.cb
==============================================================================
--- trunk/src/mainboard/tyan/s4880/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/tyan/s4880/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -6,6 +6,7 @@
         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

Modified: trunk/src/mainboard/tyan/s4882/Kconfig
==============================================================================
--- trunk/src/mainboard/tyan/s4882/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/tyan/s4882/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -65,8 +65,4 @@
 	int
 	default 22
 
-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
-	hex
-	default 0x4882
-
 endif # BOARD_TYAN_S4882

Modified: trunk/src/mainboard/tyan/s4882/devicetree.cb
==============================================================================
--- trunk/src/mainboard/tyan/s4882/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/tyan/s4882/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -5,6 +5,7 @@
                 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

Modified: trunk/src/mainboard/via/Kconfig
==============================================================================
--- trunk/src/mainboard/via/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/via/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -32,8 +32,4 @@
 	string
 	default "VIA"
 
-config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
-	hex
-	default 0x1019
-
 endif # VENDOR_VIA

Modified: trunk/src/mainboard/via/pc2500e/Kconfig
==============================================================================
--- trunk/src/mainboard/via/pc2500e/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/via/pc2500e/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -26,14 +26,6 @@
 	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"

Modified: trunk/src/mainboard/via/pc2500e/devicetree.cb
==============================================================================
--- trunk/src/mainboard/via/pc2500e/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/via/pc2500e/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -1,5 +1,6 @@
 chip northbridge/via/cn700			# Northbridge
   device pci_domain 0 on			# PCI domain
+    subsystemid 0x1019 0xaa51 inherit
     device pci 0.0 on end			# AGP Bridge
     device pci 0.1 on end			# Error Reporting
     device pci 0.2 on end			# Host Bus Control

Modified: trunk/src/mainboard/wyse/Kconfig
==============================================================================
--- trunk/src/mainboard/wyse/Kconfig	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/wyse/Kconfig	Tue Mar  1 20:58:47 2011	(r6421)
@@ -32,8 +32,4 @@
 	string
 	default "Wyse"
 
-config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
-	hex
-	default 0x102d
-
 endif # VENDOR_WYSE

Modified: trunk/src/mainboard/wyse/s50/devicetree.cb
==============================================================================
--- trunk/src/mainboard/wyse/s50/devicetree.cb	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/mainboard/wyse/s50/devicetree.cb	Tue Mar  1 20:58:47 2011	(r6421)
@@ -28,6 +28,7 @@
 		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

Modified: trunk/src/southbridge/intel/i82801gx/pci.c
==============================================================================
--- trunk/src/southbridge/intel/i82801gx/pci.c	Tue Mar  1 20:58:15 2011	(r6420)
+++ trunk/src/southbridge/intel/i82801gx/pci.c	Tue Mar  1 20:58:47 2011	(r6421)
@@ -71,13 +71,11 @@
 	/* 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);


