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

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

b43: N-PHY: isloate 2055 radio setup 



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

drivers/net/wireless/b43/phy_n.c

+17 −6
Original line number Original line Diff line number Diff line
@@ -155,6 +155,22 @@ static void b43_nphy_tx_power_fix(struct b43_wldev *dev) 
	//TODO

	//TODO

}

}







/* http://bcm-v4.sipsolutions.net/802.11/PHY/Radio/2055Setup */

static void b43_radio_2055_setup(struct b43_wldev *dev,

				const struct b43_nphy_channeltab_entry *e)

{

	B43_WARN_ON(dev->phy.rev >= 3);



	b43_chantab_radio_upload(dev, e);

	udelay(50);

	b43_radio_write(dev, B2055_VCO_CAL10, 5);

	b43_radio_write(dev, B2055_VCO_CAL10, 45);

	b43_read32(dev, B43_MMIO_MACCTL); /* flush writes */

	b43_radio_write(dev, B2055_VCO_CAL10, 65);

	udelay(300);

}



/* Tune the hardware to a new channel. */

/* Tune the hardware to a new channel. */

static int nphy_channel_switch(struct b43_wldev *dev, unsigned int channel)

static int nphy_channel_switch(struct b43_wldev *dev, unsigned int channel)

{

{
@@ -169,12 +185,7 @@ static int nphy_channel_switch(struct b43_wldev *dev, unsigned int channel) 
		b43_radio_maskset(dev, B2055_MASTER1, 0xFF8F, 0x20);

		b43_radio_maskset(dev, B2055_MASTER1, 0xFF8F, 0x20);

	else

	else

		b43_radio_maskset(dev, B2055_MASTER1, 0xFF8F, 0x50);

		b43_radio_maskset(dev, B2055_MASTER1, 0xFF8F, 0x50);

	b43_chantab_radio_upload(dev, tabent);

	b43_radio_2055_setup(dev, tabent);

	udelay(50);

	b43_radio_write16(dev, B2055_VCO_CAL10, 5);

	b43_radio_write16(dev, B2055_VCO_CAL10, 45);

	b43_radio_write16(dev, B2055_VCO_CAL10, 65);

	udelay(300);

	if (0 /*FIXME 5Ghz*/)

	if (0 /*FIXME 5Ghz*/)

		b43_phy_set(dev, B43_NPHY_BANDCTL, B43_NPHY_BANDCTL_5GHZ);

		b43_phy_set(dev, B43_NPHY_BANDCTL, B43_NPHY_BANDCTL_5GHZ);

	else

	else