summaryrefslogtreecommitdiffstats
path: root/drivers/bcma/main.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/bcma/main.c')
-rw-r--r--drivers/bcma/main.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c
index 297a2d46985a..c421403cab43 100644
--- a/drivers/bcma/main.c
+++ b/drivers/bcma/main.c
@@ -173,6 +173,7 @@ static int bcma_register_devices(struct bcma_bus *bus)
173 switch (core->id.id) { 173 switch (core->id.id) {
174 case BCMA_CORE_4706_CHIPCOMMON: 174 case BCMA_CORE_4706_CHIPCOMMON:
175 case BCMA_CORE_CHIPCOMMON: 175 case BCMA_CORE_CHIPCOMMON:
176 case BCMA_CORE_NS_CHIPCOMMON_B:
176 case BCMA_CORE_PCI: 177 case BCMA_CORE_PCI:
177 case BCMA_CORE_PCIE: 178 case BCMA_CORE_PCIE:
178 case BCMA_CORE_PCIE2: 179 case BCMA_CORE_PCIE2:
@@ -287,6 +288,13 @@ int bcma_bus_register(struct bcma_bus *bus)
287 bcma_core_chipcommon_init(&bus->drv_cc); 288 bcma_core_chipcommon_init(&bus->drv_cc);
288 } 289 }
289 290
291 /* Init CC core */
292 core = bcma_find_core(bus, BCMA_CORE_NS_CHIPCOMMON_B);
293 if (core) {
294 bus->drv_cc_b.core = core;
295 bcma_core_chipcommon_b_init(&bus->drv_cc_b);
296 }
297
290 /* Init MIPS core */ 298 /* Init MIPS core */
291 core = bcma_find_core(bus, BCMA_CORE_MIPS_74K); 299 core = bcma_find_core(bus, BCMA_CORE_MIPS_74K);
292 if (core) { 300 if (core) {
@@ -341,6 +349,8 @@ void bcma_bus_unregister(struct bcma_bus *bus)
341 else if (err) 349 else if (err)
342 bcma_err(bus, "Can not unregister GPIO driver: %i\n", err); 350 bcma_err(bus, "Can not unregister GPIO driver: %i\n", err);
343 351
352 bcma_core_chipcommon_b_free(&bus->drv_cc_b);
353
344 cores[0] = bcma_find_core(bus, BCMA_CORE_MIPS_74K); 354 cores[0] = bcma_find_core(bus, BCMA_CORE_MIPS_74K);
345 cores[1] = bcma_find_core(bus, BCMA_CORE_PCIE); 355 cores[1] = bcma_find_core(bus, BCMA_CORE_PCIE);
346 cores[2] = bcma_find_core(bus, BCMA_CORE_4706_MAC_GBIT_COMMON); 356 cores[2] = bcma_find_core(bus, BCMA_CORE_4706_MAC_GBIT_COMMON);