aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-4.3
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2016-01-04 12:22:24 +0000
committerRafał Miłecki <zajec5@gmail.com>2016-01-04 12:22:24 +0000
commitccb7d794ff2ea14369c1759a1e2bcf885e64d456 (patch)
tree71d63f0cfb2264a760fb90f43ed6a45de5c63c3c /target/linux/generic/patches-4.3
parentb1986d8fd686da402c5db34d9bea4f09c421b29a (diff)
downloadupstream-ccb7d794ff2ea14369c1759a1e2bcf885e64d456.tar.gz
upstream-ccb7d794ff2ea14369c1759a1e2bcf885e64d456.tar.bz2
upstream-ccb7d794ff2ea14369c1759a1e2bcf885e64d456.zip
kernel: update bcma by backporting 4.4 and 4.5 patches
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> SVN-Revision: 48111
Diffstat (limited to 'target/linux/generic/patches-4.3')
-rw-r--r--target/linux/generic/patches-4.3/020-bcma-from-4.4.patch18
-rw-r--r--target/linux/generic/patches-4.3/021-bcma-from-4.5.patch49
2 files changed, 67 insertions, 0 deletions
diff --git a/target/linux/generic/patches-4.3/020-bcma-from-4.4.patch b/target/linux/generic/patches-4.3/020-bcma-from-4.4.patch
index 5704081ee4..bc7b26e568 100644
--- a/target/linux/generic/patches-4.3/020-bcma-from-4.4.patch
+++ b/target/linux/generic/patches-4.3/020-bcma-from-4.4.patch
@@ -24,3 +24,21 @@ Date: Fri Sep 18 22:08:17 2015 +0200
#define BCMA_CORE_DEFAULT 0xFFF
#define BCMA_MAX_NR_CORES 16
+--- a/drivers/bcma/main.c
++++ b/drivers/bcma/main.c
+@@ -436,13 +436,8 @@ int bcma_bus_register(struct bcma_bus *b
+ }
+
+ dev = bcma_bus_get_host_dev(bus);
+- /* TODO: remove check for IS_BUILTIN(CONFIG_BCMA) check when
+- * of_default_bus_match_table is exported or in some other way
+- * accessible. This is just a temporary workaround.
+- */
+- if (IS_BUILTIN(CONFIG_BCMA) && dev) {
+- of_platform_populate(dev->of_node, of_default_bus_match_table,
+- NULL, dev);
++ if (dev) {
++ of_platform_default_populate(dev->of_node, NULL, dev);
+ }
+
+ /* Cores providing flash access go before SPROM init */
diff --git a/target/linux/generic/patches-4.3/021-bcma-from-4.5.patch b/target/linux/generic/patches-4.3/021-bcma-from-4.5.patch
new file mode 100644
index 0000000000..21ebff58b6
--- /dev/null
+++ b/target/linux/generic/patches-4.3/021-bcma-from-4.5.patch
@@ -0,0 +1,49 @@
+--- a/drivers/bcma/main.c
++++ b/drivers/bcma/main.c
+@@ -668,11 +668,36 @@ static int bcma_device_uevent(struct dev
+ core->id.rev, core->id.class);
+ }
+
+-static int __init bcma_modinit(void)
++static unsigned int bcma_bus_registered;
++
++/*
++ * If built-in, bus has to be registered early, before any driver calls
++ * bcma_driver_register.
++ * Otherwise registering driver would trigger BUG in driver_register.
++ */
++static int __init bcma_init_bus_register(void)
+ {
+ int err;
+
++ if (bcma_bus_registered)
++ return 0;
++
+ err = bus_register(&bcma_bus_type);
++ if (!err)
++ bcma_bus_registered = 1;
++
++ return err;
++}
++#ifndef MODULE
++fs_initcall(bcma_init_bus_register);
++#endif
++
++/* Main initialization has to be done with SPI/mtd/NAND/SPROM available */
++static int __init bcma_modinit(void)
++{
++ int err;
++
++ err = bcma_init_bus_register();
+ if (err)
+ return err;
+
+@@ -691,7 +716,7 @@ static int __init bcma_modinit(void)
+
+ return err;
+ }
+-fs_initcall(bcma_modinit);
++module_init(bcma_modinit);
+
+ static void __exit bcma_modexit(void)
+ {