summaryrefslogtreecommitdiff
path: root/target/linux/generic/patches-4.3/020-bcma-from-4.4.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/generic/patches-4.3/020-bcma-from-4.4.patch')
-rw-r--r--target/linux/generic/patches-4.3/020-bcma-from-4.4.patch18
1 files changed, 18 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 5704081..bc7b26e 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 */