tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

b43: N-PHY: update switching analog on/off

Specs were recently updated.

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

authored by

Rafał Miłecki and committed by
John W. Linville 2a870831 a6b7da5d

+17 -4
+17 -4
drivers/net/wireless/b43/phy_n.c
··· 4025 4025 /* http://bcm-v4.sipsolutions.net/802.11/PHY/Anacore */ 4026 4026 static void b43_nphy_op_switch_analog(struct b43_wldev *dev, bool on) 4027 4027 { 4028 - u16 val = on ? 0 : 0x7FFF; 4028 + u16 override = on ? 0x0 : 0x7FFF; 4029 + u16 core = on ? 0xD : 0x00FD; 4029 4030 4030 - if (dev->phy.rev >= 3) 4031 - b43_phy_write(dev, B43_NPHY_AFECTL_OVER1, val); 4032 - b43_phy_write(dev, B43_NPHY_AFECTL_OVER, val); 4031 + if (dev->phy.rev >= 3) { 4032 + if (on) { 4033 + b43_phy_write(dev, B43_NPHY_AFECTL_C1, core); 4034 + b43_phy_write(dev, B43_NPHY_AFECTL_OVER1, override); 4035 + b43_phy_write(dev, B43_NPHY_AFECTL_C2, core); 4036 + b43_phy_write(dev, B43_NPHY_AFECTL_OVER, override); 4037 + } else { 4038 + b43_phy_write(dev, B43_NPHY_AFECTL_OVER1, override); 4039 + b43_phy_write(dev, B43_NPHY_AFECTL_C1, core); 4040 + b43_phy_write(dev, B43_NPHY_AFECTL_OVER, override); 4041 + b43_phy_write(dev, B43_NPHY_AFECTL_C2, core); 4042 + } 4043 + } else { 4044 + b43_phy_write(dev, B43_NPHY_AFECTL_OVER, override); 4045 + } 4033 4046 } 4034 4047 4035 4048 static int b43_nphy_op_switch_channel(struct b43_wldev *dev,