bcma: move flash detection code to ChipCommon core driver

Flashes are attached and accessible through ChipCommon core, they aren't
connected to MIPS one. Moreover some new ARM devices (e.g. BCM47189) may
have serial flash accessibility using ChipCommon registers as well. To
support them we can't keep this code in MIPS core driver.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/bcma/driver_chipcommon.c b/drivers/bcma/driver_chipcommon.c
index b0f44a2937b9cb03d3ae8bbbebfc7035fe134ab2..921ce1834673231e597d2b85e48bb5e4307bf3b1 100644 (file)
--- a/drivers/bcma/driver_chipcommon.c
+++ b/drivers/bcma/driver_chipcommon.c
@@ -115,6 +115,33 @@ int bcma_chipco_watchdog_register(struct bcma_drv_cc *cc)
        return 0;
 }
 
+static void bcma_core_chipcommon_flash_detect(struct bcma_drv_cc *cc)
+{
+       struct bcma_bus *bus = cc->core->bus;
+
+       switch (cc->capabilities & BCMA_CC_CAP_FLASHT) {
+       case BCMA_CC_FLASHT_STSER:
+       case BCMA_CC_FLASHT_ATSER:
+               bcma_debug(bus, "Found serial flash\n");
+               bcma_sflash_init(cc);
+               break;
+       case BCMA_CC_FLASHT_PARA:
+               bcma_debug(bus, "Found parallel flash\n");
+               bcma_pflash_init(cc);
+               break;
+       default:
+               bcma_err(bus, "Flash type not supported\n");
+       }
+
+       if (cc->core->id.rev == 38 ||
+           bus->chipinfo.id == BCMA_CHIP_ID_BCM4706) {
+               if (cc->capabilities & BCMA_CC_CAP_NFLASH) {
+                       bcma_debug(bus, "Found NAND flash\n");
+                       bcma_nflash_init(cc);
+               }
+       }
+}
+
 void bcma_core_chipcommon_early_init(struct bcma_drv_cc *cc)
 {
        struct bcma_bus *bus = cc->core->bus;
@@ -136,6 +163,9 @@ void bcma_core_chipcommon_early_init(struct bcma_drv_cc *cc)
        if (IS_BUILTIN(CONFIG_BCM47XX) && bus->hosttype == BCMA_HOSTTYPE_SOC)
                bcma_chipco_serial_init(cc);
 
+       if (bus->hosttype == BCMA_HOSTTYPE_SOC)
+               bcma_core_chipcommon_flash_detect(cc);
+
        cc->early_setup_done = true;
 }
 

diff --git a/drivers/bcma/driver_mips.c b/drivers/bcma/driver_mips.c
index 967b0e85e2cc3c7d1f7660624e83b3851326c6db..96f17132820080843e9216523bc1328b2f8f7939 100644 (file)
--- a/drivers/bcma/driver_mips.c
+++ b/drivers/bcma/driver_mips.c
@@ -250,34 +250,11 @@ static enum bcma_boot_dev bcma_boot_dev(struct bcma_bus *bus)
        return BCMA_BOOT_DEV_SERIAL;
 }
 
-static void bcma_core_mips_flash_detect(struct bcma_drv_mips *mcore)
+static void bcma_core_mips_nvram_init(struct bcma_drv_mips *mcore)
 {
        struct bcma_bus *bus = mcore->core->bus;
-       struct bcma_drv_cc *cc = &bus->drv_cc;
        enum bcma_boot_dev boot_dev;
 
-       switch (cc->capabilities & BCMA_CC_CAP_FLASHT) {
-       case BCMA_CC_FLASHT_STSER:
-       case BCMA_CC_FLASHT_ATSER:
-               bcma_debug(bus, "Found serial flash\n");
-               bcma_sflash_init(cc);
-               break;
-       case BCMA_CC_FLASHT_PARA:
-               bcma_debug(bus, "Found parallel flash\n");
-               bcma_pflash_init(cc);
-               break;
-       default:
-               bcma_err(bus, "Flash type not supported\n");
-       }
-
-       if (cc->core->id.rev == 38 ||
-           bus->chipinfo.id == BCMA_CHIP_ID_BCM4706) {
-               if (cc->capabilities & BCMA_CC_CAP_NFLASH) {
-                       bcma_debug(bus, "Found NAND flash\n");
-                       bcma_nflash_init(cc);
-               }
-       }
-
        /* Determine flash type this SoC boots from */
        boot_dev = bcma_boot_dev(bus);
        switch (boot_dev) {
@@ -304,7 +281,7 @@ void bcma_core_mips_early_init(struct bcma_drv_mips *mcore)
        if (mcore->early_setup_done)
                return;
 
-       bcma_core_mips_flash_detect(mcore);
+       bcma_core_mips_nvram_init(mcore);
 
        mcore->early_setup_done = true;
 }