bcma: move bus struct setup into early part of host specific code

This change is important for SoC host. In future we will want to know
chip ID (needed for early MIPS boot) before doing cores scanning.

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

4 files changed, 6 insertions, 9 deletions

diff --git a/drivers/bcma/host_pci.c b/drivers/bcma/host_pci.c
index f032ed6dd459..1e5ac0a79696 100644
--- a/drivers/bcma/host_pci.c
+++ b/drivers/bcma/host_pci.c
@@ -208,6 +208,9 @@ static int bcma_host_pci_probe(struct pci_dev *dev,
         bus->boardinfo.vendor = bus->host_pci->subsystem_vendor;
         bus->boardinfo.type = bus->host_pci->subsystem_device;
 
+        /* Initialize struct, detect chip */
+        bcma_init_bus(bus);
+
         /* Register */
         err = bcma_bus_register(bus);
         if (err)
diff --git a/drivers/bcma/host_soc.c b/drivers/bcma/host_soc.c
index 1edd7e064621..379e0d4ebe72 100644
--- a/drivers/bcma/host_soc.c
+++ b/drivers/bcma/host_soc.c
@@ -178,6 +178,9 @@ int __init bcma_host_soc_register(struct bcma_soc *soc)
         bus->hosttype = BCMA_HOSTTYPE_SOC;
         bus->ops = &bcma_host_soc_ops;
 
+        /* Initialize struct, detect chip */
+        bcma_init_bus(bus);
+
         /* Register */
         err = bcma_bus_early_register(bus, &soc->core_cc, &soc->core_mips);
         if (err)
diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c
index 0ff8d58831ef..9f6b0cb9a12c 100644
--- a/drivers/bcma/main.c
+++ b/drivers/bcma/main.c
@@ -334,8 +334,6 @@ int __init bcma_bus_early_register(struct bcma_bus *bus,
         struct bcma_device *core;
         struct bcma_device_id match;
 
-        bcma_init_bus(bus);
-
         match.manuf = BCMA_MANUF_BCM;
         match.id = bcma_cc_core_id(bus);
         match.class = BCMA_CL_SIM;
diff --git a/drivers/bcma/scan.c b/drivers/bcma/scan.c
index e9bd77249a4c..e2b990303042 100644
--- a/drivers/bcma/scan.c
+++ b/drivers/bcma/scan.c
@@ -438,9 +438,6 @@ void bcma_init_bus(struct bcma_bus *bus)
         s32 tmp;
         struct bcma_chipinfo *chipinfo = &(bus->chipinfo);
 
-        if (bus->init_done)
-                return;
-
         INIT_LIST_HEAD(&bus->cores);
         bus->nr_cores = 0;
 
@@ -452,8 +449,6 @@ void bcma_init_bus(struct bcma_bus *bus)
         chipinfo->pkg = (tmp & BCMA_CC_ID_PKG) >> BCMA_CC_ID_PKG_SHIFT;
         bcma_info(bus, "Found chip with id 0x%04X, rev 0x%02X and package 0x%02X\n",
                   chipinfo->id, chipinfo->rev, chipinfo->pkg);
-
-        bus->init_done = true;
 }
 
 int bcma_bus_scan(struct bcma_bus *bus)
@@ -463,8 +458,6 @@ int bcma_bus_scan(struct bcma_bus *bus)
 
         int err, core_num = 0;
 
-        bcma_init_bus(bus);
-
         erombase = bcma_scan_read32(bus, 0, BCMA_CC_EROM);
         if (bus->hosttype == BCMA_HOSTTYPE_SOC) {
                 eromptr = ioremap_nocache(erombase, BCMA_CORE_SIZE);