b43: HT-PHY: implement switching analog

Turning it on is always done between reading PHY version and radio
version, so it was easy to find it in MMIO dumps from ndiswrapper.
Turning off is done by writing different values to the same registers.

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_ht.c b/drivers/net/wireless/b43/phy_ht.c
index e535041c40414e59510d6fb12ae8fa2d75503d37..5777cdbc047b8e49c452eb11113d3bea109a6cef 100644 (file)
--- a/drivers/net/wireless/b43/phy_ht.c
+++ b/drivers/net/wireless/b43/phy_ht.c
@@ -59,6 +59,25 @@ static void b43_phy_ht_op_free(struct b43_wldev *dev)
        phy->ht = NULL;
 }
 
+static void b43_phy_ht_op_switch_analog(struct b43_wldev *dev, bool on)
+{
+       if (on) {
+               b43_phy_write(dev, B43_PHY_HT_AFE_CTL2, 0x00cd);
+               b43_phy_write(dev, B43_PHY_HT_AFE_CTL1, 0x0000);
+               b43_phy_write(dev, B43_PHY_HT_AFE_CTL4, 0x00cd);
+               b43_phy_write(dev, B43_PHY_HT_AFE_CTL3, 0x0000);
+               b43_phy_write(dev, B43_PHY_HT_AFE_CTL6, 0x00cd);
+               b43_phy_write(dev, B43_PHY_HT_AFE_CTL5, 0x0000);
+       } else {
+               b43_phy_write(dev, B43_PHY_HT_AFE_CTL1, 0x07ff);
+               b43_phy_write(dev, B43_PHY_HT_AFE_CTL2, 0x00fd);
+               b43_phy_write(dev, B43_PHY_HT_AFE_CTL3, 0x07ff);
+               b43_phy_write(dev, B43_PHY_HT_AFE_CTL4, 0x00fd);
+               b43_phy_write(dev, B43_PHY_HT_AFE_CTL5, 0x07ff);
+               b43_phy_write(dev, B43_PHY_HT_AFE_CTL6, 0x00fd);
+       }
+}
+
 static unsigned int b43_phy_ht_op_get_default_chan(struct b43_wldev *dev)
 {
        if (b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ)
@@ -124,7 +143,9 @@ const struct b43_phy_operations b43_phyops_ht = {
        .radio_write            = b43_phy_ht_op_radio_write,
        /*
        .software_rfkill        = b43_phy_ht_op_software_rfkill,
+       */
        .switch_analog          = b43_phy_ht_op_switch_analog,
+       /*
        .switch_channel         = b43_phy_ht_op_switch_channel,
        */
        .get_default_chan       = b43_phy_ht_op_get_default_chan,

diff --git a/drivers/net/wireless/b43/phy_ht.h b/drivers/net/wireless/b43/phy_ht.h
index aabad6f229415f63736383e8226bb1804593a7fc..84ac47cbfaad6d8c5ff0fa76137737d5f7f5c683 100644 (file)
--- a/drivers/net/wireless/b43/phy_ht.h
+++ b/drivers/net/wireless/b43/phy_ht.h
@@ -8,6 +8,13 @@
 #define B43_PHY_HT_TABLE_DATALO                        0x073 /* Table data low */
 #define B43_PHY_HT_TABLE_DATAHI                        0x074 /* Table data high */
 
+#define B43_PHY_HT_AFE_CTL1                    B43_PHY_EXTG(0x110)
+#define B43_PHY_HT_AFE_CTL2                    B43_PHY_EXTG(0x111)
+#define B43_PHY_HT_AFE_CTL3                    B43_PHY_EXTG(0x114)
+#define B43_PHY_HT_AFE_CTL4                    B43_PHY_EXTG(0x115)
+#define B43_PHY_HT_AFE_CTL5                    B43_PHY_EXTG(0x118)
+#define B43_PHY_HT_AFE_CTL6                    B43_PHY_EXTG(0x119)
+
 
 struct b43_phy_ht {
 };