Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

Conflicts:
	drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c
	drivers/staging/ath6kl/os/linux/ar6000_drv.c

1 files changed, 69 insertions, 1 deletions

diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c
index 873e2e4ac55f..7072216a2a3f 100644
--- a/drivers/bcma/main.c
+++ b/drivers/bcma/main.c
@@ -66,6 +66,10 @@ static struct bcma_device *bcma_find_core(struct bcma_bus *bus, u16 coreid)
 static void bcma_release_core_dev(struct device *dev)
 {
         struct bcma_device *core = container_of(dev, struct bcma_device, dev);
+        if (core->io_addr)
+                iounmap(core->io_addr);
+        if (core->io_wrap)
+                iounmap(core->io_wrap);
         kfree(core);
 }
 
@@ -80,6 +84,7 @@ static int bcma_register_cores(struct bcma_bus *bus)
                 case BCMA_CORE_CHIPCOMMON:
                 case BCMA_CORE_PCI:
                 case BCMA_CORE_PCIE:
+                case BCMA_CORE_MIPS_74K:
                         continue;
                 }
 
@@ -93,7 +98,10 @@ static int bcma_register_cores(struct bcma_bus *bus)
                         core->dma_dev = &bus->host_pci->dev;
                         core->irq = bus->host_pci->irq;
                         break;
-                case BCMA_HOSTTYPE_NONE:
+                case BCMA_HOSTTYPE_SOC:
+                        core->dev.dma_mask = &core->dev.coherent_dma_mask;
+                        core->dma_dev = &core->dev;
+                        break;
                 case BCMA_HOSTTYPE_SDIO:
                         break;
                 }
@@ -140,6 +148,13 @@ int bcma_bus_register(struct bcma_bus *bus)
                 bcma_core_chipcommon_init(&bus->drv_cc);
         }
 
+        /* Init MIPS core */
+        core = bcma_find_core(bus, BCMA_CORE_MIPS_74K);
+        if (core) {
+                bus->drv_mips.core = core;
+                bcma_core_mips_init(&bus->drv_mips);
+        }
+
         /* Init PCIE core */
         core = bcma_find_core(bus, BCMA_CORE_PCIE);
         if (core) {
@@ -169,6 +184,59 @@ void bcma_bus_unregister(struct bcma_bus *bus)
         bcma_unregister_cores(bus);
 }
 
+int __init bcma_bus_early_register(struct bcma_bus *bus,
+                                   struct bcma_device *core_cc,
+                                   struct bcma_device *core_mips)
+{
+        int err;
+        struct bcma_device *core;
+        struct bcma_device_id match;
+
+        bcma_init_bus(bus);
+
+        match.manuf = BCMA_MANUF_BCM;
+        match.id = BCMA_CORE_CHIPCOMMON;
+        match.class = BCMA_CL_SIM;
+        match.rev = BCMA_ANY_REV;
+
+        /* Scan for chip common core */
+        err = bcma_bus_scan_early(bus, &match, core_cc);
+        if (err) {
+                pr_err("Failed to scan for common core: %d\n", err);
+                return -1;
+        }
+
+        match.manuf = BCMA_MANUF_MIPS;
+        match.id = BCMA_CORE_MIPS_74K;
+        match.class = BCMA_CL_SIM;
+        match.rev = BCMA_ANY_REV;
+
+        /* Scan for mips core */
+        err = bcma_bus_scan_early(bus, &match, core_mips);
+        if (err) {
+                pr_err("Failed to scan for mips core: %d\n", err);
+                return -1;
+        }
+
+        /* Init CC core */
+        core = bcma_find_core(bus, BCMA_CORE_CHIPCOMMON);
+        if (core) {
+                bus->drv_cc.core = core;
+                bcma_core_chipcommon_init(&bus->drv_cc);
+        }
+
+        /* Init MIPS core */
+        core = bcma_find_core(bus, BCMA_CORE_MIPS_74K);
+        if (core) {
+                bus->drv_mips.core = core;
+                bcma_core_mips_init(&bus->drv_mips);
+        }
+
+        pr_info("Early bus registered\n");
+
+        return 0;
+}
+
 int __bcma_driver_register(struct bcma_driver *drv, struct module *owner)
 {
         drv->drv.name = drv->name;