bcma: add functions to scan cores needed on SoCs

The chip common and mips core have to be setup early in the boot
process to get the cpu clock.
bcma_bus_early_register() gets pointers to some space to store the core
data and searches for the chip common and mips core and initializes
chip common. After that was done and the kernel is out of early boot we
just have to run bcma_bus_register() and it will search for the other
cores, initialize and register them.
The cores are getting the same numbers as before.

Acked-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Acked-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 46 insertions, 0 deletions

diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c
index 873e2e4ac55f..360a289738fc 100644
--- a/drivers/bcma/main.c
+++ b/drivers/bcma/main.c
@@ -169,6 +169,52 @@ 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);
+        }
+
+        pr_info("Early bus registered\n");
+
+        return 0;
+}
+
 int __bcma_driver_register(struct bcma_driver *drv, struct module *owner)
 {
         drv->drv.name = drv->name;