aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2011-03-01 21:40:39 +0100
committerJohn W. Linville <linville@tuxdriver.com>2011-03-04 14:05:17 -0500
commit0f4091b9af7151cf510bcf9160e970982c883101 (patch)
tree779d93760c57029b0eb53160dcd037497b9ca989
parenta7a9a24dcd2c57edf148ca9a14a510a5765ecf20 (diff)
downloadkernel_samsung_smdk4412-0f4091b9af7151cf510bcf9160e970982c883101.zip
kernel_samsung_smdk4412-0f4091b9af7151cf510bcf9160e970982c883101.tar.gz
kernel_samsung_smdk4412-0f4091b9af7151cf510bcf9160e970982c883101.tar.bz2
b43: N-PHY: rev3+: correct switching analog core
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/b43/phy_n.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/b43/phy_n.c
index 9f5a3c9..6c9aa5a 100644
--- a/drivers/net/wireless/b43/phy_n.c
+++ b/drivers/net/wireless/b43/phy_n.c
@@ -3878,10 +3878,14 @@ static void b43_nphy_op_software_rfkill(struct b43_wldev *dev,
}
}
+/* http://bcm-v4.sipsolutions.net/802.11/PHY/Anacore */
static void b43_nphy_op_switch_analog(struct b43_wldev *dev, bool on)
{
- b43_phy_write(dev, B43_NPHY_AFECTL_OVER,
- on ? 0 : 0x7FFF);
+ u16 val = on ? 0 : 0x7FFF;
+
+ if (dev->phy.rev >= 3)
+ b43_phy_write(dev, B43_NPHY_AFECTL_OVER1, val);
+ b43_phy_write(dev, B43_NPHY_AFECTL_OVER, val);
}
static int b43_nphy_op_switch_channel(struct b43_wldev *dev,