bcma: add an extra pcie core struct

The BCM4706 has two PCIe host controller on the bcma bus. For PCIe
client mode it is assumed that there is only one PCIe controller so the
PCIe driver, like b43 and brcmsmac are accessing the first PCIe
controller when they want to issue a operation on the host controller.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

2 files changed, 26 insertions, 3 deletions

diff --git a/drivers/bcma/driver_pci_host.c b/drivers/bcma/driver_pci_host.c
index 9baf886e82df..63172c9f871a 100644
--- a/drivers/bcma/driver_pci_host.c
+++ b/drivers/bcma/driver_pci_host.c
@@ -452,6 +452,8 @@ void __devinit bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc)
                         pc_host->mem_resource.start = BCMA_SOC_PCI_MEM;
                         pc_host->mem_resource.end = BCMA_SOC_PCI_MEM +
                                                     BCMA_SOC_PCI_MEM_SZ - 1;
+                        pc_host->io_resource.start = 0x100;
+                        pc_host->io_resource.end = 0x47F;
                         pci_membase_1G = BCMA_SOC_PCIE_DMA_H32;
                         pcicore_write32(pc, BCMA_CORE_PCI_SBTOPCI0,
                                         tmp | BCMA_SOC_PCI_MEM);
@@ -459,6 +461,8 @@ void __devinit bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc)
                         pc_host->mem_resource.start = BCMA_SOC_PCI1_MEM;
                         pc_host->mem_resource.end = BCMA_SOC_PCI1_MEM +
                                                     BCMA_SOC_PCI_MEM_SZ - 1;
+                        pc_host->io_resource.start = 0x480;
+                        pc_host->io_resource.end = 0x7FF;
                         pci_membase_1G = BCMA_SOC_PCIE1_DMA_H32;
                         pc_host->host_cfg_addr = BCMA_SOC_PCI1_CFG;
                         pcicore_write32(pc, BCMA_CORE_PCI_SBTOPCI0,
diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c
index d6b5c4ca4c43..7f473cf0469e 100644
--- a/drivers/bcma/main.c
+++ b/drivers/bcma/main.c
@@ -81,6 +81,18 @@ struct bcma_device *bcma_find_core(struct bcma_bus *bus, u16 coreid)
 }
 EXPORT_SYMBOL_GPL(bcma_find_core);
 
+static struct bcma_device *bcma_find_core_unit(struct bcma_bus *bus, u16 coreid,
+                                               u8 unit)
+{
+        struct bcma_device *core;
+
+        list_for_each_entry(core, &bus->cores, list) {
+                if (core->id.id == coreid && core->core_unit == unit)
+                        return core;
+        }
+        return NULL;
+}
+
 static void bcma_release_core_dev(struct device *dev)
 {
         struct bcma_device *core = container_of(dev, struct bcma_device, dev);
@@ -211,10 +223,17 @@ int __devinit bcma_bus_register(struct bcma_bus *bus)
         }
 
         /* Init PCIE core */
-        core = bcma_find_core(bus, BCMA_CORE_PCIE);
+        core = bcma_find_core_unit(bus, BCMA_CORE_PCIE, 0);
+        if (core) {
+                bus->drv_pci[0].core = core;
+                bcma_core_pci_init(&bus->drv_pci[0]);
+        }
+
+        /* Init PCIE core */
+        core = bcma_find_core_unit(bus, BCMA_CORE_PCIE, 1);
         if (core) {
-                bus->drv_pci.core = core;
-                bcma_core_pci_init(&bus->drv_pci);
+                bus->drv_pci[1].core = core;
+                bcma_core_pci_init(&bus->drv_pci[1]);
         }
 
         /* Init GBIT MAC COMMON core */