bcma: just do the necessary things in early register on SoCs

Some parts of the initialization for chip common and the pcie core are
accessing the sprom struct, but it is not initialized at that stage.
Just do the necessary thing in the early register on SoCs and not the
complete initialization to read out the nvram from the flash chip.
After it is possible to read out the nvram, the sprom should be parsed
from it and the full initialization of the cores should be run.

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

1 files changed, 19 insertions, 7 deletions

diff --git a/drivers/bcma/driver_mips.c b/drivers/bcma/driver_mips.c
index cc65b45b4368..f44f1fb67011 100644
--- a/drivers/bcma/driver_mips.c
+++ b/drivers/bcma/driver_mips.c
@@ -212,16 +212,33 @@ static void bcma_core_mips_flash_detect(struct bcma_drv_mips *mcore)
         }
 }
 
+void bcma_core_mips_early_init(struct bcma_drv_mips *mcore)
+{
+        struct bcma_bus *bus = mcore->core->bus;
+
+        if (mcore->early_setup_done)
+                return;
+
+        bcma_chipco_serial_init(&bus->drv_cc);
+        bcma_core_mips_flash_detect(mcore);
+
+        mcore->early_setup_done = true;
+}
+
 void bcma_core_mips_init(struct bcma_drv_mips *mcore)
 {
         struct bcma_bus *bus;
         struct bcma_device *core;
         bus = mcore->core->bus;
 
+        if (mcore->setup_done)
+                return;
+
         bcma_info(bus, "Initializing MIPS core...\n");
 
-        if (!mcore->setup_done)
-                mcore->assigned_irqs = 1;
+        bcma_core_mips_early_init(mcore);
+
+        mcore->assigned_irqs = 1;
 
         /* Assign IRQs to all cores on the bus */
         list_for_each_entry(core, &bus->cores, list) {
@@ -256,10 +273,5 @@ void bcma_core_mips_init(struct bcma_drv_mips *mcore)
         bcma_info(bus, "IRQ reconfiguration done\n");
         bcma_core_mips_dump_irq(bus);
 
-        if (mcore->setup_done)
-                return;
-
-        bcma_chipco_serial_init(&bus->drv_cc);
-        bcma_core_mips_flash_detect(mcore);
         mcore->setup_done = true;
 }