kernel: update bcma by backporting 4.4 and 4.5 patches

[openwrt/openwrt.git] / target / linux / generic / patches-4.3 / 020-bcma-from-4.4.patch

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 5704081ee43df1bbfa389377d10697e05b032fc5..bc7b26e568e44d2cda1635e10b6fd7f95fe63904 100644 (file)
--- 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
  #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 */