Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a73815e authored by Rafał Miłecki's avatar Rafał Miłecki Committed by John W. Linville
Browse files

b43: G-PHY: fix random mistakes to match specs 



Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent c5534844

drivers/net/wireless/b43/phy_g.c

+3 −3
Original line number Diff line number Diff line
@@ -1587,6 +1587,7 @@ static void b43_phy_initb5(struct b43_wldev *dev) 
	b43_write16(dev, 0x03E4, (b43_read16(dev, 0x03E4) & 0xFFC0) | 0x0004);

}



/* http://bcm-v4.sipsolutions.net/802.11/PHY/Init/B6 */

static void b43_phy_initb6(struct b43_wldev *dev)

{

	struct b43_phy *phy = &dev->phy;
@@ -1670,7 +1671,7 @@ static void b43_phy_initb6(struct b43_wldev *dev) 
		b43_radio_write16(dev, 0x50, 0x20);

	}

	if (phy->radio_rev <= 2) {

		b43_radio_write16(dev, 0x7C, 0x20);

		b43_radio_write16(dev, 0x50, 0x20);

		b43_radio_write16(dev, 0x5A, 0x70);

		b43_radio_write16(dev, 0x5B, 0x7B);

		b43_radio_write16(dev, 0x5C, 0xB0);
@@ -1686,9 +1687,8 @@ static void b43_phy_initb6(struct b43_wldev *dev) 
		b43_phy_write(dev, 0x2A, 0x8AC0);

	b43_phy_write(dev, 0x0038, 0x0668);

	b43_set_txpower_g(dev, &gphy->bbatt, &gphy->rfatt, gphy->tx_control);

	if (phy->radio_rev <= 5) {

	if (phy->radio_rev == 4 || phy->radio_rev == 5)

		b43_phy_maskset(dev, 0x5D, 0xFF80, 0x0003);

	}

	if (phy->radio_rev <= 2)

		b43_radio_write16(dev, 0x005D, 0x000D);

drivers/net/wireless/b43/wa.c

+1 −1
Original line number Diff line number Diff line
@@ -441,7 +441,7 @@ static void b43_wa_altagc(struct b43_wldev *dev) 


static void b43_wa_tr_ltov(struct b43_wldev *dev) /* TR Lookup Table Original Values */

{

	b43_gtab_write(dev, B43_GTAB_ORIGTR, 0, 0xC480);

	b43_gtab_write(dev, B43_GTAB_ORIGTR, 0, 0x7654);

}



static void b43_wa_cpll_nonpilot(struct b43_wldev *dev)