target/linux/generic/patches-3.18/032-bcma-from-4.6.patch

   1 --- a/drivers/bcma/driver_chipcommon.c
   2 +++ b/drivers/bcma/driver_chipcommon.c
   3 @@ -190,6 +190,7 @@ u32 bcma_chipco_watchdog_timer_set(struc
   4                 struct bcma_bus *bus = cc->core->bus;
   5
   6                 if (bus->chipinfo.id != BCMA_CHIP_ID_BCM4707 &&
   7 +                   bus->chipinfo.id != BCMA_CHIP_ID_BCM47094 &&
   8                     bus->chipinfo.id != BCMA_CHIP_ID_BCM53018)
   9                         bcma_core_set_clockmode(cc->core,
  10                                                 ticks ? BCMA_CLKMODE_FAST : BCMA_CLKMODE_DYNAMIC);
  11 --- a/drivers/bcma/driver_chipcommon_sflash.c
  12 +++ b/drivers/bcma/driver_chipcommon_sflash.c
  13 @@ -38,6 +38,7 @@ static const struct bcma_sflash_tbl_e bc
  14         { "M25P32", 0x15, 0x10000, 64, },
  15         { "M25P64", 0x16, 0x10000, 128, },
  16         { "M25FL128", 0x17, 0x10000, 256, },
  17 +       { "MX25L25635F", 0x18, 0x10000, 512, },
  18         { NULL },
  19  };
  20
  21 --- a/drivers/bcma/driver_gpio.c
  22 +++ b/drivers/bcma/driver_gpio.c
  23 @@ -229,6 +229,7 @@ int bcma_gpio_init(struct bcma_drv_cc *c
  24         case BCMA_CHIP_ID_BCM4707:
  25         case BCMA_CHIP_ID_BCM5357:
  26         case BCMA_CHIP_ID_BCM53572:
  27 +       case BCMA_CHIP_ID_BCM47094:
  28                 chip->ngpio     = 32;
  29                 break;
  30         default:
  31 --- a/drivers/bcma/host_pci.c
  32 +++ b/drivers/bcma/host_pci.c
  33 @@ -294,7 +294,7 @@ static const struct pci_device_id bcma_p
  34         { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4358) },
  35         { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4359) },
  36         { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4360) },
  37 -       { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4365) },
  38 +       { PCI_DEVICE_SUB(PCI_VENDOR_ID_BROADCOM, 0x4365, PCI_VENDOR_ID_DELL, 0x0016) },
  39         { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x43a0) },
  40         { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x43a9) },
  41         { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x43aa) },
  42 --- a/drivers/bcma/scan.c
  43 +++ b/drivers/bcma/scan.c
  44 @@ -98,6 +98,9 @@ static const struct bcma_device_id_name
  45         { BCMA_CORE_SHIM, "SHIM" },
  46         { BCMA_CORE_PCIE2, "PCIe Gen2" },
  47         { BCMA_CORE_ARM_CR4, "ARM CR4" },
  48 +       { BCMA_CORE_GCI, "GCI" },
  49 +       { BCMA_CORE_CMEM, "CNDS DDR2/3 memory controller" },
  50 +       { BCMA_CORE_ARM_CA7, "ARM CA7" },
  51         { BCMA_CORE_DEFAULT, "Default" },
  52  };
  53
  54 --- a/include/linux/bcma/bcma.h
  55 +++ b/include/linux/bcma/bcma.h
  56 @@ -151,6 +151,8 @@ struct bcma_host_ops {
  57  #define BCMA_CORE_PCIE2                        0x83C   /* PCI Express Gen2 */
  58  #define BCMA_CORE_USB30_DEV            0x83D
  59  #define BCMA_CORE_ARM_CR4              0x83E
  60 +#define BCMA_CORE_GCI                  0x840
  61 +#define BCMA_CORE_CMEM                 0x846   /* CNDS DDR2/3 memory controller */
  62  #define BCMA_CORE_ARM_CA7              0x847
  63  #define BCMA_CORE_SYS_MEM              0x849
  64  #define BCMA_CORE_DEFAULT              0xFFF
  65 @@ -199,6 +201,7 @@ struct bcma_host_ops {
  66  #define  BCMA_PKG_ID_BCM4707   1
  67  #define  BCMA_PKG_ID_BCM4708   2
  68  #define  BCMA_PKG_ID_BCM4709   0
  69 +#define BCMA_CHIP_ID_BCM47094  53030
  70  #define BCMA_CHIP_ID_BCM53018  53018
  71
  72  /* Board types (on PCI usually equals to the subsystem dev id) */