target/linux/generic/patches-4.3/020-bcma-from-4.4.patch

   1 commit 55acca90da52b85299c033354e51ddaa7b73e019
   2 Author: Hante Meuleman <meuleman@broadcom.com>
   3 Date:   Fri Sep 18 22:08:17 2015 +0200
   4
   5     brcmfmac: Add support for the BCM4365 and BCM4366 PCIE devices.
   6
   7     This patch adds support for the BCM4365 and BCM4366 11ac Wave2
   8     PCIE devices.
   9
  10     Reviewed-by: Arend Van Spriel <arend@broadcom.com>
  11     Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
  12     Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
  13     Signed-off-by: Arend van Spriel <arend@broadcom.com>
  14     Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  15
  16 --- a/include/linux/bcma/bcma.h
  17 +++ b/include/linux/bcma/bcma.h
  18 @@ -151,6 +151,8 @@ struct bcma_host_ops {
  19  #define BCMA_CORE_PCIE2                        0x83C   /* PCI Express Gen2 */
  20  #define BCMA_CORE_USB30_DEV            0x83D
  21  #define BCMA_CORE_ARM_CR4              0x83E
  22 +#define BCMA_CORE_ARM_CA7              0x847
  23 +#define BCMA_CORE_SYS_MEM              0x849
  24  #define BCMA_CORE_DEFAULT              0xFFF
  25
  26  #define BCMA_MAX_NR_CORES              16
  27 --- a/drivers/bcma/main.c
  28 +++ b/drivers/bcma/main.c
  29 @@ -436,13 +436,8 @@ int bcma_bus_register(struct bcma_bus *b
  30         }
  31
  32         dev = bcma_bus_get_host_dev(bus);
  33 -       /* TODO: remove check for IS_BUILTIN(CONFIG_BCMA) check when
  34 -        * of_default_bus_match_table is exported or in some other way
  35 -        * accessible. This is just a temporary workaround.
  36 -        */
  37 -       if (IS_BUILTIN(CONFIG_BCMA) && dev) {
  38 -               of_platform_populate(dev->of_node, of_default_bus_match_table,
  39 -                                    NULL, dev);
  40 +       if (dev) {
  41 +               of_platform_default_populate(dev->of_node, NULL, dev);
  42         }
  43
  44         /* Cores providing flash access go before SPROM init */