b43: add support for BCM43131 chipset with N-PHY rev 17

It contains radio 0x2057 rev 14 just like a BCM43217, so it doesn't
require any magic. The main difference is that BCM4313 is 1x1:1.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index d7055febe1195406e4a6f8823e64ec7bba2bfb76..2af1ac396eb451897371f6ff576f565843781e69 100644 (file)
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -2985,7 +2985,8 @@ void b43_mac_switch_freq(struct b43_wldev *dev, u8 spurmode)
 {
        u16 chip_id = dev->dev->chip_id;
 
-       if (chip_id == BCMA_CHIP_ID_BCM43217 ||
+       if (chip_id == BCMA_CHIP_ID_BCM43131 ||
+           chip_id == BCMA_CHIP_ID_BCM43217 ||
            chip_id == BCMA_CHIP_ID_BCM43222 ||
            chip_id == BCMA_CHIP_ID_BCM43224 ||
            chip_id == BCMA_CHIP_ID_BCM43225 ||

diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/b43/phy_n.c
index d269fbb27b9ebabbc66db7b41263cf316aee463d..1eead7af6899a995b75c922d3e079940376fe793 100644 (file)
--- a/drivers/net/wireless/b43/phy_n.c
+++ b/drivers/net/wireless/b43/phy_n.c
@@ -4982,7 +4982,8 @@ static void b43_nphy_int_pa_set_tx_dig_filters(struct b43_wldev *dev)
        if (dev->phy.rev == 16)
                b43_nphy_pa_set_tx_dig_filter(dev, 0x186, dig_filter_phy_rev16);
 
-       if (dev->dev->chip_id == BCMA_CHIP_ID_BCM43217) {
+       /* Verified with BCM43131 and BCM43217 */
+       if (dev->phy.rev == 17) {
                b43_nphy_pa_set_tx_dig_filter(dev, 0x186, dig_filter_phy_rev16);
                b43_nphy_pa_set_tx_dig_filter(dev, 0x195,
                                              tbl_tx_filter_coef_rev4[1]);

diff --git a/include/linux/bcma/bcma.h b/include/linux/bcma/bcma.h
index 969af0f2bdf92cdaf14d5e040a6b76f70dd32984..70b8d88b39822811928274931ce125667e244635 100644 (file)
--- a/include/linux/bcma/bcma.h
+++ b/include/linux/bcma/bcma.h
@@ -158,6 +158,7 @@ struct bcma_host_ops {
 /* Chip IDs of PCIe devices */
 #define BCMA_CHIP_ID_BCM4313   0x4313
 #define BCMA_CHIP_ID_BCM43142  43142
+#define BCMA_CHIP_ID_BCM43131  43131
 #define BCMA_CHIP_ID_BCM43217  43217
 #define BCMA_CHIP_ID_BCM43222  43222
 #define BCMA_CHIP_ID_BCM43224  43224