b43: N-PHY: update low-pass filter setup

Add support for external PA and clean code a bit.

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/phy_n.c b/drivers/net/wireless/b43/phy_n.c
index d9409b446ac194b765be83f3d7d7df5898930fb5..0fb5e14a4554c2858075616a7faa810f7b54b05a 100644 (file)
--- a/drivers/net/wireless/b43/phy_n.c
+++ b/drivers/net/wireless/b43/phy_n.c
@@ -3706,21 +3706,28 @@ static void b43_nphy_pa_override(struct b43_wldev *dev, bool enable)
        }
 }
 
-/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/TxLpFbw */
-static void b43_nphy_tx_lp_fbw(struct b43_wldev *dev)
+/*
+ * TX low-pass filter bandwidth setup
+ * http://bcm-v4.sipsolutions.net/802.11/PHY/N/TxLpFbw
+ */
+static void b43_nphy_tx_lpf_bw(struct b43_wldev *dev)
 {
        u16 tmp;
 
-       if (dev->phy.rev >= 3) {
-               if (b43_nphy_ipa(dev)) {
-                       tmp = 4;
-                       b43_phy_write(dev, B43_NPHY_TXF_40CO_B32S2,
-                             (((((tmp << 3) | tmp) << 3) | tmp) << 3) | tmp);
-               }
+       if (dev->phy.rev < 3 || dev->phy.rev >= 7)
+               return;
 
-               tmp = 1;
+       if (b43_nphy_ipa(dev))
+               tmp = b43_is_40mhz(dev) ? 5 : 4;
+       else
+               tmp = b43_is_40mhz(dev) ? 3 : 1;
+       b43_phy_write(dev, B43_NPHY_TXF_40CO_B32S2,
+                     (tmp << 9) | (tmp << 6) | (tmp << 3) | tmp);
+
+       if (b43_nphy_ipa(dev)) {
+               tmp = b43_is_40mhz(dev) ? 4 : 1;
                b43_phy_write(dev, B43_NPHY_TXF_40CO_B1S2,
-                             (((((tmp << 3) | tmp) << 3) | tmp) << 3) | tmp);
+                             (tmp << 9) | (tmp << 6) | (tmp << 3) | tmp);
        }
 }
 
@@ -5347,7 +5354,7 @@ static int b43_phy_initn(struct b43_wldev *dev)
        b43_phy_write(dev, B43_NPHY_TXMACDELAY, 0x0320);
        if (phy->rev >= 3 && phy->rev <= 6)
                b43_phy_write(dev, B43_NPHY_PLOAD_CSENSE_EXTLEN, 0x0032);
-       b43_nphy_tx_lp_fbw(dev);
+       b43_nphy_tx_lpf_bw(dev);
        if (phy->rev >= 3)
                b43_nphy_spur_workaround(dev);
 
@@ -5433,7 +5440,7 @@ static void b43_nphy_channel_setup(struct b43_wldev *dev,
        if (dev->phy.rev < 3)
                b43_nphy_adjust_lna_gain_table(dev);
 
-       b43_nphy_tx_lp_fbw(dev);
+       b43_nphy_tx_lpf_bw(dev);
 
        if (dev->phy.rev >= 3 &&
            dev->phy.n->spur_avoid != B43_SPUR_AVOID_DISABLE) {