diff options
| author | David S. Miller <davem@davemloft.net> | 2016-02-17 02:38:29 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-02-17 02:38:29 +0100 |
| commit | 6cd21d79419c154a73be6fa31bc1a1f42ffd6815 (patch) | |
| tree | 22cb1457513247074e48fde6cc378df06ae108be /drivers/bcma/driver_gpio.c | |
| parent | net: phy: spi_ks8995: include linux/gpio/consumer.h (diff) | |
| parent | mwifiex: firmware dump support for w8997 chipset (diff) | |
| download | linux-6cd21d79419c154a73be6fa31bc1a1f42ffd6815.tar.xz linux-6cd21d79419c154a73be6fa31bc1a1f42ffd6815.zip | |
Merge tag 'wireless-drivers-next-for-davem-2016-02-12' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next
Kalle Valo says:
====================
Major changes:
wl12xx
* add device tree support for SPI
mwifiex
* add debugfs file to read chip information
* add MSIx support for newer pcie chipsets (8997 onwards)
* add schedule scan support
* add WoWLAN net-detect support
* firmware dump support for w8997 chipset
iwlwifi
* continue the work on multiple Rx queues
* add support for beacon storing used in low power states
* use the regular firmware image of WoWLAN
* fix 8000 devices for Big Endian machines
* more firmware debug hooks
* add support for P2P Client snoozing
* make the beacon filtering for AP mode configurable
* fix transmit queues overflow with LSO
libertas
* add support for setting power save via cfg80211
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/bcma/driver_gpio.c')
| -rw-r--r-- | drivers/bcma/driver_gpio.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/bcma/driver_gpio.c b/drivers/bcma/driver_gpio.c index 98067f757fb0..771a2a253440 100644 --- a/drivers/bcma/driver_gpio.c +++ b/drivers/bcma/driver_gpio.c @@ -192,6 +192,7 @@ int bcma_gpio_init(struct bcma_drv_cc *cc) case BCMA_CHIP_ID_BCM4707: case BCMA_CHIP_ID_BCM5357: case BCMA_CHIP_ID_BCM53572: + case BCMA_CHIP_ID_BCM47094: chip->ngpio = 32; break; default: |