Use subsystem id from devicetree.cb instead of Kconfig and move

all boards to the new config scheme.

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

git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6421 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

17 files changed, 8 insertions, 48 deletions

diff --git a/src/mainboard/asus/Kconfig b/src/mainboard/asus/Kconfig
index bf8742a3f0..875fd5aa12 100644
--- a/src/mainboard/asus/Kconfig
+++ b/src/mainboard/asus/Kconfig
@@ -77,8 +77,4 @@ config MAINBOARD_VENDOR
 	string
 	default "ASUS"
 
-config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
-	hex
-	default 0x1043
-
 endif # VENDOR_ASUS
diff --git a/src/mainboard/asus/a8n_e/Kconfig b/src/mainboard/asus/a8n_e/Kconfig
index 6512589bfd..aca9e33d0e 100644
--- a/src/mainboard/asus/a8n_e/Kconfig
+++ b/src/mainboard/asus/a8n_e/Kconfig
@@ -70,12 +70,4 @@ config IRQ_SLOT_COUNT
 	int
 	default 13
 
-config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
-	hex
-	default 0x1043
-
-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
-	hex
-	default 0x815a
-
 endif # BOARD_ASUS_A8N_E
diff --git a/src/mainboard/asus/a8n_e/devicetree.cb b/src/mainboard/asus/a8n_e/devicetree.cb
index 1144f0c9ca..86bf3aa2e8 100644
--- a/src/mainboard/asus/a8n_e/devicetree.cb
+++ b/src/mainboard/asus/a8n_e/devicetree.cb
@@ -6,6 +6,7 @@ chip northbridge/amd/amdk8/root_complex		# Root complex
   end
 
   device pci_domain 0 on			# PCI domain
+    subsystemid 0x1043 0x815a inherit
     chip northbridge/amd/amdk8			# Northbridge / RAM controller
       device pci 18.0 on			# Link 0 == LDT 0
         chip southbridge/nvidia/ck804		# Southbridge
diff --git a/src/mainboard/asus/a8v-e_deluxe/Kconfig b/src/mainboard/asus/a8v-e_deluxe/Kconfig
index f9ac563aed..05408ca0a7 100644
--- a/src/mainboard/asus/a8v-e_deluxe/Kconfig
+++ b/src/mainboard/asus/a8v-e_deluxe/Kconfig
@@ -70,8 +70,4 @@ config HT_CHAIN_UNITID_BASE
 	hex
 	default 0x0
 
-config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
-	hex
-	default 0x1043
-
 endif # BOARD_ASUS_A8V_E_DELUXE
diff --git a/src/mainboard/asus/a8v-e_deluxe/devicetree.cb b/src/mainboard/asus/a8v-e_deluxe/devicetree.cb
index cd803929c8..31df8fa3c1 100644
--- a/src/mainboard/asus/a8v-e_deluxe/devicetree.cb
+++ b/src/mainboard/asus/a8v-e_deluxe/devicetree.cb
@@ -5,6 +5,7 @@ chip northbridge/amd/amdk8/root_complex		# Root complex
     end
   end
   device pci_domain 0 on			# PCI domain
+    subsystemid 1043 0 inherit
     chip northbridge/amd/amdk8			# mc0
       device pci 18.0 on			# Northbridge
         # Devices on link 0, link 0 == LDT 0
diff --git a/src/mainboard/asus/a8v-e_se/Kconfig b/src/mainboard/asus/a8v-e_se/Kconfig
index abf2bd9252..4975cfaebd 100644
--- a/src/mainboard/asus/a8v-e_se/Kconfig
+++ b/src/mainboard/asus/a8v-e_se/Kconfig
@@ -70,8 +70,4 @@ config HT_CHAIN_UNITID_BASE
 	hex
 	default 0x0
 
-config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
-	hex
-	default 0x1043
-
 endif # BOARD_ASUS_A8V_E_SE
diff --git a/src/mainboard/asus/a8v-e_se/devicetree.cb b/src/mainboard/asus/a8v-e_se/devicetree.cb
index cd803929c8..3da93fedf7 100644
--- a/src/mainboard/asus/a8v-e_se/devicetree.cb
+++ b/src/mainboard/asus/a8v-e_se/devicetree.cb
@@ -5,6 +5,7 @@ chip northbridge/amd/amdk8/root_complex		# Root complex
     end
   end
   device pci_domain 0 on			# PCI domain
+    subsystemid 0x1043 0 inherit
     chip northbridge/amd/amdk8			# mc0
       device pci 18.0 on			# Northbridge
         # Devices on link 0, link 0 == LDT 0
diff --git a/src/mainboard/asus/m2n-e/Kconfig b/src/mainboard/asus/m2n-e/Kconfig
index 60b7e15684..c23a2df91e 100644
--- a/src/mainboard/asus/m2n-e/Kconfig
+++ b/src/mainboard/asus/m2n-e/Kconfig
@@ -98,8 +98,4 @@ config SERIAL_CPU_INIT
 	bool
 	default n
 
-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
-	hex
-	default 0x8239
-
 endif # BOARD_ASUS_M2N_E
diff --git a/src/mainboard/asus/m2n-e/devicetree.cb b/src/mainboard/asus/m2n-e/devicetree.cb
index dbadf0ed77..bf4de2585a 100644
--- a/src/mainboard/asus/m2n-e/devicetree.cb
+++ b/src/mainboard/asus/m2n-e/devicetree.cb
@@ -25,6 +25,7 @@ chip northbridge/amd/amdk8/root_complex		# Root complex
     end
   end
   device pci_domain 0 on			# PCI domain
+    subsystemid 0x1043 0x8239 inherit
     chip northbridge/amd/amdk8			# Northbridge / RAM controller
       device pci 18.0 on			# Link 0 == LDT 0
         chip southbridge/nvidia/mcp55		# Southbridge
diff --git a/src/mainboard/asus/m2v-mx_se/Kconfig b/src/mainboard/asus/m2v-mx_se/Kconfig
index b6a2fe638f..09157ee22f 100644
--- a/src/mainboard/asus/m2v-mx_se/Kconfig
+++ b/src/mainboard/asus/m2v-mx_se/Kconfig
@@ -89,8 +89,4 @@ config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x20
 
-config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
-	hex
-	default 0x1043
-
 endif # BOARD_ASUS_M2V_MX_SE
diff --git a/src/mainboard/asus/m2v-mx_se/devicetree.cb b/src/mainboard/asus/m2v-mx_se/devicetree.cb
index 93a3a879ed..7e4c6d1079 100644
--- a/src/mainboard/asus/m2v-mx_se/devicetree.cb
+++ b/src/mainboard/asus/m2v-mx_se/devicetree.cb
@@ -5,6 +5,7 @@ chip northbridge/amd/amdk8/root_complex		# Root complex
     end
   end
   device pci_domain 0 on			# PCI domain
+    subsystemid 0x1043 0 inherit
     chip northbridge/amd/amdk8			# mc0
       device pci 18.0 on			# Northbridge
         # Devices on link 0, link 0 == LDT 0
diff --git a/src/mainboard/asus/m2v/Kconfig b/src/mainboard/asus/m2v/Kconfig
index 757bc324c0..571b940bf7 100644
--- a/src/mainboard/asus/m2v/Kconfig
+++ b/src/mainboard/asus/m2v/Kconfig
@@ -75,10 +75,6 @@ config HT_CHAIN_UNITID_BASE
 	hex
 	default 0x0
 
-config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
-	hex
-	default 0x1043
-
 config IRQ_SLOT_COUNT
 	int
 	default 14
diff --git a/src/mainboard/asus/m2v/devicetree.cb b/src/mainboard/asus/m2v/devicetree.cb
index a08defba93..5138e252e4 100644
--- a/src/mainboard/asus/m2v/devicetree.cb
+++ b/src/mainboard/asus/m2v/devicetree.cb
@@ -5,6 +5,7 @@ chip northbridge/amd/amdk8/root_complex		# Root complex
     end
   end
   device pci_domain 0 on			# PCI domain
+    subsystemid 0x143 0 inherit
     chip northbridge/amd/amdk8			# mc0
       device pci 18.0 on			# Northbridge
         # Devices on link 0, link 0 == LDT 0
diff --git a/src/mainboard/asus/m4a78-em/Kconfig b/src/mainboard/asus/m4a78-em/Kconfig
index 18542d3366..d036b212bf 100644
--- a/src/mainboard/asus/m4a78-em/Kconfig
+++ b/src/mainboard/asus/m4a78-em/Kconfig
@@ -77,14 +77,6 @@ config HEAP_SIZE
 	hex
 	default 0xc0000
 
-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
-	hex
-	default 0x83f1
-
-config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
-	hex
-	default 0x1043
-
 config RAMBASE
 	hex
 	default 0x200000
diff --git a/src/mainboard/asus/m4a78-em/devicetree.cb b/src/mainboard/asus/m4a78-em/devicetree.cb
index 914fde42fa..c463d71740 100644
--- a/src/mainboard/asus/m4a78-em/devicetree.cb
+++ b/src/mainboard/asus/m4a78-em/devicetree.cb
@@ -5,6 +5,7 @@ chip northbridge/amd/amdfam10/root_complex
 		end
 	end
 	device pci_domain 0 on
+		subsystemid 0x1043 0x83f1 inherit
 		chip northbridge/amd/amdfam10
 			device pci 18.0 on #  northbridge
 				chip southbridge/amd/rs780
diff --git a/src/mainboard/asus/m4a785-m/Kconfig b/src/mainboard/asus/m4a785-m/Kconfig
index e41fcc2670..84cc06ceab 100644
--- a/src/mainboard/asus/m4a785-m/Kconfig
+++ b/src/mainboard/asus/m4a785-m/Kconfig
@@ -78,14 +78,6 @@ config HEAP_SIZE
 	hex
 	default 0xc0000
 
-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
-	hex
-	default 0x83a2
-
-config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
-	hex
-	default 0x1043
-
 config RAMBASE
 	hex
 	default 0x200000
diff --git a/src/mainboard/asus/m4a785-m/devicetree.cb b/src/mainboard/asus/m4a785-m/devicetree.cb
index 0736b72c08..e8764b1eba 100644
--- a/src/mainboard/asus/m4a785-m/devicetree.cb
+++ b/src/mainboard/asus/m4a785-m/devicetree.cb
@@ -5,6 +5,7 @@ chip northbridge/amd/amdfam10/root_complex
 		end
 	end
 	device pci_domain 0 on
+		subsystemid 0x1043 0x83a2 inherit
 		chip northbridge/amd/amdfam10
 			device pci 18.0 on #  northbridge
 				chip southbridge/amd/rs780