38 lines
957 B
Diff
38 lines
957 B
Diff
|
--- a/drivers/bcma/main.c
|
||
|
|
+++ b/drivers/bcma/main.c
|
||
|
|
@@ -165,6 +165,20 @@ int __devinit bcma_bus_register(struct b
|
||
|
|
return -1;
|
||
|
|
}
|
||
|
|
|
||
|
|
+ /* Early init CC core */
|
||
|
|
+ core = bcma_find_core(bus, bcma_cc_core_id(bus));
|
||
|
|
+ if (core) {
|
||
|
|
+ bus->drv_cc.core = core;
|
||
|
|
+ bcma_core_chipcommon_early_init(&bus->drv_cc);
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ /* Try to get SPROM */
|
||
|
|
+ err = bcma_sprom_get(bus);
|
||
|
|
+ if (err == -ENOENT) {
|
||
|
|
+ bcma_err(bus, "No SPROM available\n");
|
||
|
|
+ } else if (err)
|
||
|
|
+ bcma_err(bus, "Failed to get SPROM: %d\n", err);
|
||
|
|
+
|
||
|
|
/* Init CC core */
|
||
|
|
core = bcma_find_core(bus, bcma_cc_core_id(bus));
|
||
|
|
if (core) {
|
||
|
|
@@ -193,13 +207,6 @@ int __devinit bcma_bus_register(struct b
|
||
|
|
bcma_core_gmac_cmn_init(&bus->drv_gmac_cmn);
|
||
|
|
}
|
||
|
|
|
||
|
|
- /* Try to get SPROM */
|
||
|
|
- err = bcma_sprom_get(bus);
|
||
|
|
- if (err == -ENOENT) {
|
||
|
|
- bcma_err(bus, "No SPROM available\n");
|
||
|
|
- } else if (err)
|
||
|
|
- bcma_err(bus, "Failed to get SPROM: %d\n", err);
|
||
|
|
-
|
||
|
|
/* Register found cores */
|
||
|
|
bcma_register_cores(bus);
|
||
|
|
|