b43: LCN-PHY: switch analog

Analog is switched on right after reading PHY version:
 read16 0xfaafc3e0 -> 0xa801
 phy_read(0x043b) -> 0x0000
phy_write(0x043b) <- 0x0000
Switched off after after killing radio:
>>> Switch Radio(OFF) end
 phy_read(0x043c) -> 0x0000
phy_write(0x043c) <- 0x0007
 phy_read(0x043b) -> 0x0000
phy_write(0x043b) <- 0x0007

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_lcn.c b/drivers/net/wireless/b43/phy_lcn.c
index 69a93b5..0fd72c1 100644 (file)
--- a/drivers/net/wireless/b43/phy_lcn.c
+++ b/drivers/net/wireless/b43/phy_lcn.c
@@ -81,6 +81,16 @@ static void b43_phy_lcn_op_software_rfkill(struct b43_wldev *dev,
        }
 }
 
+static void b43_phy_lcn_op_switch_analog(struct b43_wldev *dev, bool on)
+{
+       if (on) {
+               b43_phy_mask(dev, B43_PHY_LCN_AFE_CTL1, ~0x7);
+       } else {
+               b43_phy_set(dev, B43_PHY_LCN_AFE_CTL2, 0x7);
+               b43_phy_set(dev, B43_PHY_LCN_AFE_CTL1, 0x7);
+       }
+}
+
 static unsigned int b43_phy_lcn_op_get_default_chan(struct b43_wldev *dev)
 {
        if (b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ)
@@ -115,8 +125,8 @@ const struct b43_phy_operations b43_phyops_lcn = {
        .radio_write            = b43_phy_lcn_op_radio_write,
        */
        .software_rfkill        = b43_phy_lcn_op_software_rfkill,
-       /*
        .switch_analog          = b43_phy_lcn_op_switch_analog,
+       /*
        .switch_channel         = b43_phy_lcn_op_switch_channel,
        */
        .get_default_chan       = b43_phy_lcn_op_get_default_chan,

diff --git a/drivers/net/wireless/b43/phy_lcn.h b/drivers/net/wireless/b43/phy_lcn.h
index 89f13b2..371e07d 100644 (file)
--- a/drivers/net/wireless/b43/phy_lcn.h
+++ b/drivers/net/wireless/b43/phy_lcn.h
@@ -4,6 +4,8 @@
 #include "phy_common.h"
 
 
+#define B43_PHY_LCN_AFE_CTL1                   B43_PHY_OFDM(0x03B)
+#define B43_PHY_LCN_AFE_CTL2                   B43_PHY_OFDM(0x03C)
 #define B43_PHY_LCN_RF_CTL1                    B43_PHY_OFDM(0x04C)
 #define B43_PHY_LCN_RF_CTL2                    B43_PHY_OFDM(0x04D)
 #define B43_PHY_LCN_RF_CTL3                    B43_PHY_OFDM(0x0B0)