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: G-PHY: fix random mistakes to match specs

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 4a73815e c5534844

+4 -4
+3 -3
drivers/net/wireless/b43/phy_g.c
··· 1587 1587 b43_write16(dev, 0x03E4, (b43_read16(dev, 0x03E4) & 0xFFC0) | 0x0004); 1588 1588 } 1589 1589 1590 + /* http://bcm-v4.sipsolutions.net/802.11/PHY/Init/B6 */ 1590 1591 static void b43_phy_initb6(struct b43_wldev *dev) 1591 1592 { 1592 1593 struct b43_phy *phy = &dev->phy; ··· 1671 1670 b43_radio_write16(dev, 0x50, 0x20); 1672 1671 } 1673 1672 if (phy->radio_rev <= 2) { 1674 - b43_radio_write16(dev, 0x7C, 0x20); 1673 + b43_radio_write16(dev, 0x50, 0x20); 1675 1674 b43_radio_write16(dev, 0x5A, 0x70); 1676 1675 b43_radio_write16(dev, 0x5B, 0x7B); 1677 1676 b43_radio_write16(dev, 0x5C, 0xB0); ··· 1687 1686 b43_phy_write(dev, 0x2A, 0x8AC0); 1688 1687 b43_phy_write(dev, 0x0038, 0x0668); 1689 1688 b43_set_txpower_g(dev, &gphy->bbatt, &gphy->rfatt, gphy->tx_control); 1690 - if (phy->radio_rev <= 5) { 1689 + if (phy->radio_rev == 4 || phy->radio_rev == 5) 1691 1690 b43_phy_maskset(dev, 0x5D, 0xFF80, 0x0003); 1692 - } 1693 1691 if (phy->radio_rev <= 2) 1694 1692 b43_radio_write16(dev, 0x005D, 0x000D); 1695 1693
+1 -1
drivers/net/wireless/b43/wa.c
··· 441 441 442 442 static void b43_wa_tr_ltov(struct b43_wldev *dev) /* TR Lookup Table Original Values */ 443 443 { 444 - b43_gtab_write(dev, B43_GTAB_ORIGTR, 0, 0xC480); 444 + b43_gtab_write(dev, B43_GTAB_ORIGTR, 0, 0x7654); 445 445 } 446 446 447 447 static void b43_wa_cpll_nonpilot(struct b43_wldev *dev)