diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2014-12-05 16:11:03 +0000 |
|---|---|---|
| committer | Rafał Miłecki <zajec5@gmail.com> | 2014-12-05 16:11:03 +0000 |
| commit | 8033ccc9757fa1aed5a286e1f8992a53611ccfa5 (patch) | |
| tree | a968d6cbcfffc76684834828aa969b9ff74350f4 /target/linux/generic/patches-3.18 | |
| parent | e0342d268400cf810c737d98f79dbc12144d53d9 (diff) | |
| download | upstream-8033ccc9757fa1aed5a286e1f8992a53611ccfa5.tar.gz upstream-8033ccc9757fa1aed5a286e1f8992a53611ccfa5.tar.bz2 upstream-8033ccc9757fa1aed5a286e1f8992a53611ccfa5.zip | |
kernel: update bcma up to 2014-10-27
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
SVN-Revision: 43527
Diffstat (limited to 'target/linux/generic/patches-3.18')
| -rw-r--r-- | target/linux/generic/patches-3.18/025-bcma_backport.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.18/025-bcma_backport.patch b/target/linux/generic/patches-3.18/025-bcma_backport.patch new file mode 100644 index 0000000000..871791e871 --- /dev/null +++ b/target/linux/generic/patches-3.18/025-bcma_backport.patch @@ -0,0 +1,46 @@ +--- 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 +@@ -169,10 +169,8 @@ static void bcma_of_fill_device(struct p + } + #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); +@@ -196,6 +194,11 @@ static void bcma_register_core(struct bc + 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), |