diff options
author | Rafał Miłecki <zajec5@gmail.com> | 2016-01-04 12:22:24 +0000 |
---|---|---|
committer | Rafał Miłecki <zajec5@gmail.com> | 2016-01-04 12:22:24 +0000 |
commit | ccb7d794ff2ea14369c1759a1e2bcf885e64d456 (patch) | |
tree | 71d63f0cfb2264a760fb90f43ed6a45de5c63c3c /target/linux/generic/patches-4.3/020-bcma-from-4.4.patch | |
parent | b1986d8fd686da402c5db34d9bea4f09c421b29a (diff) | |
download | master-31e0f0ae-ccb7d794ff2ea14369c1759a1e2bcf885e64d456.tar.gz master-31e0f0ae-ccb7d794ff2ea14369c1759a1e2bcf885e64d456.tar.bz2 master-31e0f0ae-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/020-bcma-from-4.4.patch')
-rw-r--r-- | target/linux/generic/patches-4.3/020-bcma-from-4.4.patch | 18 |
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 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 */ |