Use common code to set PCI subsystem in mcp55.

Signed-off-by: Jonathan Kollasch <jakllsch@kollasch.net>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6003 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/src/southbridge/nvidia/mcp55/mcp55.c b/src/southbridge/nvidia/mcp55/mcp55.c
index aa86cf3bc7496065b937ca22d36d0e302724dbd9..11dc5b2cd24120f57a4254272a034ff9a6ad08d1 100644 (file)
--- a/src/southbridge/nvidia/mcp55/mcp55.c
+++ b/src/southbridge/nvidia/mcp55/mcp55.c
@@ -242,6 +242,16 @@ void mcp55_enable(device_t dev)
 
 }
 
+static void mcp55_set_subsystem(device_t dev, unsigned vendor, unsigned device)
+{
+       pci_write_config32(dev, 0x40,
+                          ((device & 0xffff) << 16) | (vendor & 0xffff));
+}
+
+struct pci_operations mcp55_pci_ops = {
+       .set_subsystem = mcp55_set_subsystem,
+}; 
+
 struct chip_operations southbridge_nvidia_mcp55_ops = {
        CHIP_NAME("NVIDIA MCP55 Southbridge")
        .enable_dev     = mcp55_enable,

diff --git a/src/southbridge/nvidia/mcp55/mcp55.h b/src/southbridge/nvidia/mcp55/mcp55.h
index acb291a1d0c21f2ec8877a810156f6ec31587db6..e746cb63987c9c48161ecadc83a4b9be9975180b 100644 (file)
--- a/src/southbridge/nvidia/mcp55/mcp55.h
+++ b/src/southbridge/nvidia/mcp55/mcp55.h
@@ -26,6 +26,7 @@
 
 #ifndef __PRE_RAM__
 void mcp55_enable(device_t dev);
+extern struct pci_operations mcp55_pci_ops;
 #else
 void enable_fid_change_on_sb(unsigned sbbusn, unsigned sbdn);
 #endif

diff --git a/src/southbridge/nvidia/mcp55/mcp55_ht.c b/src/southbridge/nvidia/mcp55/mcp55_ht.c
index a05bd59df07d117966eb29b40ca54adb8ed4418e..8b0248f8a666f1122ffdb8bc218dde982f4f0df2 100644 (file)
--- a/src/southbridge/nvidia/mcp55/mcp55_ht.c
+++ b/src/southbridge/nvidia/mcp55/mcp55_ht.c
@@ -28,22 +28,13 @@
 #include <device/pci_ops.h>
 #include "mcp55.h"
 
-static void lpci_set_subsystem(device_t dev, unsigned vendor, unsigned device)
-{
-       pci_write_config32(dev, 0x40,
-               ((device & 0xffff) << 16) | (vendor & 0xffff));
-}
-static struct pci_operations lops_pci = {
-       .set_subsystem  = lpci_set_subsystem,
-};
-
 static struct device_operations ht_ops  = {
        .read_resources = pci_dev_read_resources,
        .set_resources  = pci_dev_set_resources,
        .enable_resources       = pci_dev_enable_resources,
        .init           = 0,
        .scan_bus       = 0,
-       .ops_pci        = &lops_pci,
+       .ops_pci        = &mcp55_pci_ops,
 };
 
 static const struct pci_driver ht_driver __pci_driver = {

diff --git a/src/southbridge/nvidia/mcp55/mcp55_ide.c b/src/southbridge/nvidia/mcp55/mcp55_ide.c
index fac5997513ea5e33d9795b5fc1fb8fe09bb1ba77..90dd2bf48d31945dbc8ba2368cbcf622885fb2e5 100644 (file)
--- a/src/southbridge/nvidia/mcp55/mcp55_ide.c
+++ b/src/southbridge/nvidia/mcp55/mcp55_ide.c
@@ -69,15 +69,6 @@ static void ide_init(struct device *dev)
 
 }
 
-static void lpci_set_subsystem(device_t dev, unsigned vendor, unsigned device)
-{
-       pci_write_config32(dev, 0x40,
-               ((device & 0xffff) << 16) | (vendor & 0xffff));
-}
-static struct pci_operations lops_pci = {
-       .set_subsystem  = lpci_set_subsystem,
-};
-
 static struct device_operations ide_ops  = {
        .read_resources = pci_dev_read_resources,
        .set_resources  = pci_dev_set_resources,
@@ -85,7 +76,7 @@ static struct device_operations ide_ops  = {
        .init           = ide_init,
        .scan_bus       = 0,
 //     .enable         = mcp55_enable,
-       .ops_pci        = &lops_pci,
+       .ops_pci        = &mcp55_pci_ops,
 };
 
 static const struct pci_driver ide_driver __pci_driver = {

diff --git a/src/southbridge/nvidia/mcp55/mcp55_lpc.c b/src/southbridge/nvidia/mcp55/mcp55_lpc.c
index 0fb77c3e38952151109cb490d4be7982169c7713..3132eedbd2cae4cf0c7d35474f110902a60a463e 100644 (file)
--- a/src/southbridge/nvidia/mcp55/mcp55_lpc.c
+++ b/src/southbridge/nvidia/mcp55/mcp55_lpc.c
@@ -253,16 +253,6 @@ static void mcp55_lpc_enable_resources(device_t dev)
        mcp55_lpc_enable_childrens_resources(dev);
 }
 
-static void lpci_set_subsystem(device_t dev, unsigned vendor, unsigned device)
-{
-       pci_write_config32(dev, 0x40,
-               ((device & 0xffff) << 16) | (vendor & 0xffff));
-}
-
-static struct pci_operations lops_pci = {
-       .set_subsystem  = lpci_set_subsystem,
-};
-
 static struct device_operations lpc_ops  = {
        .read_resources = mcp55_lpc_read_resources,
        .set_resources  = pci_dev_set_resources,
@@ -270,7 +260,7 @@ static struct device_operations lpc_ops  = {
        .init           = lpc_init,
        .scan_bus       = scan_static_bus,
 //     .enable         = mcp55_enable,
-       .ops_pci        = &lops_pci,
+       .ops_pci        = &mcp55_pci_ops,
 };
 static const struct pci_driver lpc_driver __pci_driver = {
        .ops    = &lpc_ops,
@@ -316,7 +306,7 @@ static struct device_operations lpc_slave_ops  = {
        .enable_resources       = pci_dev_enable_resources,
        .init           = lpc_slave_init,
 //     .enable         = mcp55_enable,
-       .ops_pci        = &lops_pci,
+       .ops_pci        = &mcp55_pci_ops,
 };
 
 static const struct pci_driver lpc_driver_slave __pci_driver = {

diff --git a/src/southbridge/nvidia/mcp55/mcp55_nic.c b/src/southbridge/nvidia/mcp55/mcp55_nic.c
index 4a9b003384c719d55c68c97d5e5ad3a18010d4d4..3533e4e25a80e007f788aa37b3b1d84a65cf9074 100644 (file)
--- a/src/southbridge/nvidia/mcp55/mcp55_nic.c
+++ b/src/southbridge/nvidia/mcp55/mcp55_nic.c
@@ -180,16 +180,6 @@ static void nic_init(struct device *dev)
 
 }
 
-static void lpci_set_subsystem(device_t dev, unsigned vendor, unsigned device)
-{
-       pci_write_config32(dev, 0x40,
-               ((device & 0xffff) << 16) | (vendor & 0xffff));
-}
-
-static struct pci_operations lops_pci = {
-       .set_subsystem  = lpci_set_subsystem,
-};
-
 static struct device_operations nic_ops  = {
        .read_resources = pci_dev_read_resources,
        .set_resources  = pci_dev_set_resources,
@@ -197,7 +187,7 @@ static struct device_operations nic_ops  = {
        .init           = nic_init,
        .scan_bus       = 0,
 //     .enable         = mcp55_enable,
-       .ops_pci        = &lops_pci,
+       .ops_pci        = &mcp55_pci_ops,
 };
 static const struct pci_driver nic_driver __pci_driver = {
        .ops    = &nic_ops,

diff --git a/src/southbridge/nvidia/mcp55/mcp55_pci.c b/src/southbridge/nvidia/mcp55/mcp55_pci.c
index 02b012488449590e0f47b505a933110db7028356..510d21d10b00dd290e40dfbda3e9db1cb85f5521 100644 (file)
--- a/src/southbridge/nvidia/mcp55/mcp55_pci.c
+++ b/src/southbridge/nvidia/mcp55/mcp55_pci.c
@@ -85,10 +85,6 @@ static void pci_init(struct device *dev)
        pci_write_config32(dev, 0x50, dword);   /* TOM */
 }
 
-static struct pci_operations lops_pci = {
-       .set_subsystem  = 0,
-};
-
 static struct device_operations pci_ops  = {
        .read_resources = pci_bus_read_resources,
        .set_resources  = pci_dev_set_resources,
@@ -97,7 +93,6 @@ static struct device_operations pci_ops  = {
        .scan_bus       = pci_scan_bridge,
 //     .enable         = mcp55_enable,
        .reset_bus      = pci_bus_reset,
-       .ops_pci        = &lops_pci,
 };
 
 static const struct pci_driver pci_driver __pci_driver = {

diff --git a/src/southbridge/nvidia/mcp55/mcp55_pcie.c b/src/southbridge/nvidia/mcp55/mcp55_pcie.c
index ecc82ec058d5d867bf999981e91cf8b6d96126fa..cb60f3143a614b4e29722ee7cb4f2ed41f1a1e7c 100644 (file)
--- a/src/southbridge/nvidia/mcp55/mcp55_pcie.c
+++ b/src/southbridge/nvidia/mcp55/mcp55_pcie.c
@@ -42,10 +42,6 @@ static void pcie_init(struct device *dev)
 
 }
 
-static struct pci_operations lops_pci = {
-       .set_subsystem  = 0,
-};
-
 static struct device_operations pcie_ops  = {
        .read_resources = pci_bus_read_resources,
        .set_resources  = pci_dev_set_resources,
@@ -53,7 +49,6 @@ static struct device_operations pcie_ops  = {
        .init           = pcie_init,
        .scan_bus       = pci_scan_bridge,
 //     .enable         = mcp55_enable,
-       .ops_pci        = &lops_pci,
 };
 
 static const struct pci_driver pciebc_driver __pci_driver = {

diff --git a/src/southbridge/nvidia/mcp55/mcp55_sata.c b/src/southbridge/nvidia/mcp55/mcp55_sata.c
index 8df5f6bcbd9018bd2dfb90c65d46f2c72bd26410..eebc61e26fc89cccdf310ef0149b288ff6c97267 100644 (file)
--- a/src/southbridge/nvidia/mcp55/mcp55_sata.c
+++ b/src/southbridge/nvidia/mcp55/mcp55_sata.c
@@ -69,15 +69,6 @@ static void sata_init(struct device *dev)
 
 }
 
-static void lpci_set_subsystem(device_t dev, unsigned vendor, unsigned device)
-{
-       pci_write_config32(dev, 0x40,
-               ((device & 0xffff) << 16) | (vendor & 0xffff));
-}
-static struct pci_operations lops_pci = {
-       .set_subsystem  = lpci_set_subsystem,
-};
-
 static struct device_operations sata_ops = {
        .read_resources = pci_dev_read_resources,
        .set_resources  = pci_dev_set_resources,
@@ -85,7 +76,7 @@ static struct device_operations sata_ops = {
 //     .enable         = mcp55_enable,
        .init           = sata_init,
        .scan_bus       = 0,
-       .ops_pci        = &lops_pci,
+       .ops_pci        = &mcp55_pci_ops,
 };
 
 static const struct pci_driver sata0_driver __pci_driver = {

diff --git a/src/southbridge/nvidia/mcp55/mcp55_smbus.c b/src/southbridge/nvidia/mcp55/mcp55_smbus.c
index 8e049a76a73404a240a4b3a05a21d032b604de75..47c422f08a6584ce5019c3f94a1984af3c08fc15 100644 (file)
--- a/src/southbridge/nvidia/mcp55/mcp55_smbus.c
+++ b/src/southbridge/nvidia/mcp55/mcp55_smbus.c
@@ -123,15 +123,6 @@ static void mcp55_sm_init(device_t dev)
 #endif
 }
 
-static void lpci_set_subsystem(device_t dev, unsigned vendor, unsigned device)
-{
-       pci_write_config32(dev, 0x40,
-               ((device & 0xffff) << 16) | (vendor & 0xffff));
-}
-
-static struct pci_operations lops_pci = {
-       .set_subsystem  = lpci_set_subsystem,
-};
 static struct device_operations smbus_ops = {
        .read_resources = mcp55_sm_read_resources,
        .set_resources  = pci_dev_set_resources,
@@ -139,7 +130,7 @@ static struct device_operations smbus_ops = {
        .init           = mcp55_sm_init,
        .scan_bus       = scan_static_bus,
 //     .enable         = mcp55_enable,
-       .ops_pci        = &lops_pci,
+       .ops_pci        = &mcp55_pci_ops,
        .ops_smbus_bus  = &lops_smbus_bus,
 };
 static const struct pci_driver smbus_driver __pci_driver = {

diff --git a/src/southbridge/nvidia/mcp55/mcp55_usb.c b/src/southbridge/nvidia/mcp55/mcp55_usb.c
index d64f2b8e5288851999b0b678c5e6226d7be0c909..c005c91743f34b2f3ddc2bfd839277951fc32e9f 100644 (file)
--- a/src/southbridge/nvidia/mcp55/mcp55_usb.c
+++ b/src/southbridge/nvidia/mcp55/mcp55_usb.c
@@ -28,15 +28,6 @@
 #include <device/pci_ops.h>
 #include "mcp55.h"
 
-static void lpci_set_subsystem(device_t dev, unsigned vendor, unsigned device)
-{
-       pci_write_config32(dev, 0x40,
-               ((device & 0xffff) << 16) | (vendor & 0xffff));
-}
-static struct pci_operations lops_pci = {
-       .set_subsystem  = lpci_set_subsystem,
-};
-
 static struct device_operations usb_ops = {
        .read_resources = pci_dev_read_resources,
        .set_resources  = pci_dev_set_resources,
@@ -44,7 +35,7 @@ static struct device_operations usb_ops = {
        .init           = 0,
 //     .enable         = mcp55_enable,
        .scan_bus       = 0,
-       .ops_pci        = &lops_pci,
+       .ops_pci        = &mcp55_pci_ops,
 };
 
 static const struct pci_driver usb_driver __pci_driver = {

diff --git a/src/southbridge/nvidia/mcp55/mcp55_usb2.c b/src/southbridge/nvidia/mcp55/mcp55_usb2.c
index 78d6d6d46936de310dae6723301028649aa7eaed..cd4fe25f17b5ac41f1f957737fd07a1f7bc91ace 100644 (file)
--- a/src/southbridge/nvidia/mcp55/mcp55_usb2.c
+++ b/src/southbridge/nvidia/mcp55/mcp55_usb2.c
@@ -62,15 +62,6 @@ static void usb2_set_resources(struct device *dev)
 
 }
 
-static void lpci_set_subsystem(device_t dev, unsigned vendor, unsigned device)
-{
-       pci_write_config32(dev, 0x40,
-               ((device & 0xffff) << 16) | (vendor & 0xffff));
-}
-static struct pci_operations lops_pci = {
-       .set_subsystem  = lpci_set_subsystem,
-};
-
 static struct device_operations usb2_ops  = {
        .read_resources = pci_dev_read_resources,
        .set_resources  = usb2_set_resources,
@@ -78,7 +69,7 @@ static struct device_operations usb2_ops  = {
        .init           = usb2_init,
 //     .enable         = mcp55_enable,
        .scan_bus       = 0,
-       .ops_pci        = &lops_pci,
+       .ops_pci        = &mcp55_pci_ops,
 };
 
 static const struct pci_driver usb2_driver __pci_driver = {