diff options
Diffstat (limited to 'src/mainboard/msi')
| -rw-r--r-- | src/mainboard/msi/Kconfig | 4 | ||||
| -rw-r--r-- | src/mainboard/msi/ms7135/Kconfig | 4 | ||||
| -rw-r--r-- | src/mainboard/msi/ms7135/devicetree.cb | 1 | ||||
| -rw-r--r-- | src/mainboard/msi/ms7260/Kconfig | 8 | ||||
| -rw-r--r-- | src/mainboard/msi/ms7260/devicetree.cb | 1 | ||||
| -rw-r--r-- | src/mainboard/msi/ms9185/Kconfig | 8 | ||||
| -rw-r--r-- | src/mainboard/msi/ms9185/devicetree.cb | 1 | ||||
| -rw-r--r-- | src/mainboard/msi/ms9282/Kconfig | 8 | ||||
| -rw-r--r-- | src/mainboard/msi/ms9282/devicetree.cb | 1 | ||||
| -rw-r--r-- | src/mainboard/msi/ms9652_fam10/Kconfig | 8 | ||||
| -rw-r--r-- | src/mainboard/msi/ms9652_fam10/devicetree.cb | 1 |
11 files changed, 5 insertions, 40 deletions
diff --git a/src/mainboard/msi/Kconfig b/src/mainboard/msi/Kconfig index c2f1595877..3d0de4a5e8 100644 --- a/src/mainboard/msi/Kconfig +++ b/src/mainboard/msi/Kconfig @@ -56,8 +56,4 @@ config MAINBOARD_VENDOR string default "MSI" -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1462 - endif # VENDOR_MSI diff --git a/src/mainboard/msi/ms7135/Kconfig b/src/mainboard/msi/ms7135/Kconfig index d8581f731c..0611be2ba9 100644 --- a/src/mainboard/msi/ms7135/Kconfig +++ b/src/mainboard/msi/ms7135/Kconfig @@ -34,10 +34,6 @@ config MAINBOARD_PART_NUMBER string default "MS-7135" -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x7135 - config MAX_CPUS int default 2 diff --git a/src/mainboard/msi/ms7135/devicetree.cb b/src/mainboard/msi/ms7135/devicetree.cb index 14c6bad1d3..54e5d5e599 100644 --- a/src/mainboard/msi/ms7135/devicetree.cb +++ b/src/mainboard/msi/ms7135/devicetree.cb @@ -6,6 +6,7 @@ chip northbridge/amd/amdk8/root_complex # Root complex end device pci_domain 0 on # PCI domain + subsystemid 0x1462 0x7135 inherit chip northbridge/amd/amdk8 # Northbridge / RAM controller device pci 18.0 on # Link 0 == LDT 0 chip southbridge/nvidia/ck804 # Southbridge diff --git a/src/mainboard/msi/ms7260/Kconfig b/src/mainboard/msi/ms7260/Kconfig index aec6af50b7..be425ecac8 100644 --- a/src/mainboard/msi/ms7260/Kconfig +++ b/src/mainboard/msi/ms7260/Kconfig @@ -80,14 +80,6 @@ config SERIAL_CPU_INIT bool default n -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1462 - -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x7260 - config IRQ_SLOT_COUNT int default 11 diff --git a/src/mainboard/msi/ms7260/devicetree.cb b/src/mainboard/msi/ms7260/devicetree.cb index 552224d2c3..47d5381b5c 100644 --- a/src/mainboard/msi/ms7260/devicetree.cb +++ b/src/mainboard/msi/ms7260/devicetree.cb @@ -5,6 +5,7 @@ chip northbridge/amd/amdk8/root_complex # Root complex end end device pci_domain 0 on # PCI domain + subsystemid 0x1462 0x7260 inherit chip northbridge/amd/amdk8 # Northbridge / RAM controller device pci 18.0 on # Link 0 == LDT 0 chip southbridge/nvidia/mcp55 # Southbridge diff --git a/src/mainboard/msi/ms9185/Kconfig b/src/mainboard/msi/ms9185/Kconfig index 5e28353007..1464acd5a2 100644 --- a/src/mainboard/msi/ms9185/Kconfig +++ b/src/mainboard/msi/ms9185/Kconfig @@ -71,12 +71,4 @@ config IRQ_SLOT_COUNT int default 11 -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1022 - -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x2b80 - endif # BOARD_MSI_MS9185 diff --git a/src/mainboard/msi/ms9185/devicetree.cb b/src/mainboard/msi/ms9185/devicetree.cb index fc566e23d3..9576225e91 100644 --- a/src/mainboard/msi/ms9185/devicetree.cb +++ b/src/mainboard/msi/ms9185/devicetree.cb @@ -5,6 +5,7 @@ chip northbridge/amd/amdk8/root_complex end end device pci_domain 0 on + subsystemid 0x1022 0x2b80 inherit chip northbridge/amd/amdk8 device pci 18.0 on end device pci 18.0 on end diff --git a/src/mainboard/msi/ms9282/Kconfig b/src/mainboard/msi/ms9282/Kconfig index f2ea65ad4b..3ccc3f9756 100644 --- a/src/mainboard/msi/ms9282/Kconfig +++ b/src/mainboard/msi/ms9282/Kconfig @@ -72,14 +72,6 @@ config SERIAL_CPU_INIT bool default n -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1462 - -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x9282 - config IRQ_SLOT_COUNT int default 11 diff --git a/src/mainboard/msi/ms9282/devicetree.cb b/src/mainboard/msi/ms9282/devicetree.cb index 74ea1832ee..b52e7ed650 100644 --- a/src/mainboard/msi/ms9282/devicetree.cb +++ b/src/mainboard/msi/ms9282/devicetree.cb @@ -5,6 +5,7 @@ chip northbridge/amd/amdk8/root_complex # Root complex end end device pci_domain 0 on # PCI domain + subsystemid 0x1462 0x9282 inherit chip northbridge/amd/amdk8 # Northbridge / RAM controller device pci 18.0 on # Link 0 == LDT 0 chip southbridge/nvidia/mcp55 # Southbridge diff --git a/src/mainboard/msi/ms9652_fam10/Kconfig b/src/mainboard/msi/ms9652_fam10/Kconfig index d8025d789e..948d320735 100644 --- a/src/mainboard/msi/ms9652_fam10/Kconfig +++ b/src/mainboard/msi/ms9652_fam10/Kconfig @@ -87,14 +87,6 @@ config MAINBOARD_PART_NUMBER string default "MS-9652" -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1462 - -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x9652 - config RAMBASE hex default 0x200000 diff --git a/src/mainboard/msi/ms9652_fam10/devicetree.cb b/src/mainboard/msi/ms9652_fam10/devicetree.cb index c3e4e4f16d..0e9a3ffe3e 100644 --- a/src/mainboard/msi/ms9652_fam10/devicetree.cb +++ b/src/mainboard/msi/ms9652_fam10/devicetree.cb @@ -28,6 +28,7 @@ chip northbridge/amd/amdfam10/root_complex # Root complex end end device pci_domain 0 on # PCI domain + subsystemid 0x1462 0x9652 inherit chip northbridge/amd/amdfam10 # Northbridge / RAM controller device pci 18.0 on # Link 0 chip southbridge/nvidia/mcp55 # Southbridge |