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

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

b43: N-PHY: implement RF control INTC for revs 7+ 



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

drivers/net/wireless/b43/phy_n.c

+72 −0
Original line number Original line Diff line number Diff line
@@ -257,6 +257,72 @@ static void b43_nphy_rf_ctl_override(struct b43_wldev *dev, u16 field, 
	}

	}

}

}





static void b43_nphy_rf_ctl_intc_override_rev7(struct b43_wldev *dev,

					       enum n_intc_override intc_override,

					       u16 value, u8 core_sel)

{

	u16 reg, tmp, tmp2, val;

	int core;



	for (core = 0; core < 2; core++) {

		if ((core_sel == 1 && core != 0) ||

		    (core_sel == 2 && core != 1))

			continue;



		reg = (core == 0) ? B43_NPHY_RFCTL_INTC1 : B43_NPHY_RFCTL_INTC2;



		switch (intc_override) {

		case N_INTC_OVERRIDE_OFF:

			b43_phy_write(dev, reg, 0);

			b43_nphy_force_rf_sequence(dev, B43_RFSEQ_RESET2RX);

			break;

		case N_INTC_OVERRIDE_TRSW:

			b43_phy_maskset(dev, reg, ~0xC0, value << 6);

			b43_phy_set(dev, reg, 0x400);



			b43_phy_mask(dev, 0x2ff, ~0xC000 & 0xFFFF);

			b43_phy_set(dev, 0x2ff, 0x2000);

			b43_phy_set(dev, 0x2ff, 0x0001);

			break;

		case N_INTC_OVERRIDE_PA:

			tmp = 0x0030;

			if (b43_current_band(dev->wl) == IEEE80211_BAND_5GHZ)

				val = value << 5;

			else

				val = value << 4;

			b43_phy_maskset(dev, reg, ~tmp, val);

			b43_phy_set(dev, reg, 0x1000);

			break;

		case N_INTC_OVERRIDE_EXT_LNA_PU:

			if (b43_current_band(dev->wl) == IEEE80211_BAND_5GHZ) {

				tmp = 0x0001;

				tmp2 = 0x0004;

				val = value;

			} else {

				tmp = 0x0004;

				tmp2 = 0x0001;

				val = value << 2;

			}

			b43_phy_maskset(dev, reg, ~tmp, val);

			b43_phy_mask(dev, reg, ~tmp2);

			break;

		case N_INTC_OVERRIDE_EXT_LNA_GAIN:

			if (b43_current_band(dev->wl) == IEEE80211_BAND_5GHZ) {

				tmp = 0x0002;

				tmp2 = 0x0008;

				val = value << 1;

			} else {

				tmp = 0x0008;

				tmp2 = 0x0002;

				val = value << 3;

			}

			b43_phy_maskset(dev, reg, ~tmp, val);

			b43_phy_mask(dev, reg, ~tmp2);

			break;

		}

	}

}



/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/RFCtrlIntcOverride */

/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/RFCtrlIntcOverride */

static void b43_nphy_rf_ctl_intc_override(struct b43_wldev *dev,

static void b43_nphy_rf_ctl_intc_override(struct b43_wldev *dev,

					  enum n_intc_override intc_override,

					  enum n_intc_override intc_override,
@@ -265,6 +331,12 @@ static void b43_nphy_rf_ctl_intc_override(struct b43_wldev *dev, 
	u8 i, j;

	u8 i, j;

	u16 reg, tmp, val;

	u16 reg, tmp, val;





	if (dev->phy.rev >= 7) {

		b43_nphy_rf_ctl_intc_override_rev7(dev, intc_override, value,

						   core);

		return;

	}



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

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





	for (i = 0; i < 2; i++) {

	for (i = 0; i < 2; i++) {