2014-10-27 23:02:08 +00:00
|
|
|
--- a/drivers/bcma/bcma_private.h
|
|
|
|
|
+++ b/drivers/bcma/bcma_private.h
|
|
|
|
|
@@ -24,6 +24,7 @@ struct bcma_bus;
|
|
|
|
|
/* main.c */
|
|
|
|
|
bool bcma_wait_value(struct bcma_device *core, u16 reg, u32 mask, u32 value,
|
|
|
|
|
int timeout);
|
|
|
|
|
+void bcma_prepare_core(struct bcma_bus *bus, struct bcma_device *core);
|
|
|
|
|
int bcma_bus_register(struct bcma_bus *bus);
|
|
|
|
|
void bcma_bus_unregister(struct bcma_bus *bus);
|
|
|
|
|
int __init bcma_bus_early_register(struct bcma_bus *bus,
|
|
|
|
|
--- a/drivers/bcma/main.c
|
|
|
|
|
+++ b/drivers/bcma/main.c
|
2014-11-01 15:57:30 +00:00
|
|
|
@@ -169,10 +169,8 @@ static void bcma_of_fill_device(struct p
|
2014-10-27 23:02:08 +00:00
|
|
|
}
|
|
|
|
|
#endif /* CONFIG_OF */
|
|
|
|
|
|
|
|
|
|
-static void bcma_register_core(struct bcma_bus *bus, struct bcma_device *core)
|
|
|
|
|
+void bcma_prepare_core(struct bcma_bus *bus, struct bcma_device *core)
|
|
|
|
|
{
|
|
|
|
|
- int err;
|
|
|
|
|
-
|
|
|
|
|
core->dev.release = bcma_release_core_dev;
|
|
|
|
|
core->dev.bus = &bcma_bus_type;
|
|
|
|
|
dev_set_name(&core->dev, "bcma%d:%d", bus->num, core->core_index);
|
2014-11-01 15:57:30 +00:00
|
|
|
@@ -196,6 +194,11 @@ static void bcma_register_core(struct bc
|
2014-10-27 23:02:08 +00:00
|
|
|
case BCMA_HOSTTYPE_SDIO:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
+static void bcma_register_core(struct bcma_bus *bus, struct bcma_device *core)
|
|
|
|
|
+{
|
|
|
|
|
+ int err;
|
|
|
|
|
|
|
|
|
|
err = device_register(&core->dev);
|
|
|
|
|
if (err) {
|
|
|
|
|
--- a/drivers/bcma/scan.c
|
|
|
|
|
+++ b/drivers/bcma/scan.c
|
|
|
|
|
@@ -505,6 +505,7 @@ int bcma_bus_scan(struct bcma_bus *bus)
|
|
|
|
|
bus->nr_cores++;
|
|
|
|
|
other_core = bcma_find_core_reverse(bus, core->id.id);
|
|
|
|
|
core->core_unit = (other_core == NULL) ? 0 : other_core->core_unit + 1;
|
|
|
|
|
+ bcma_prepare_core(bus, core);
|
|
|
|
|
|
|
|
|
|
bcma_info(bus, "Core %d found: %s (manuf 0x%03X, id 0x%03X, rev 0x%02X, class 0x%X)\n",
|
|
|
|
|
core->core_index, bcma_device_name(&core->id),
|
