From 1670cc70b6f34c5feadf294871f3d13446fcedfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
Date: Fri, 15 Jan 2010 15:02:38 +0100
Subject: [PATCH] --- yaml --- r: 183679 b: refs/heads/master c:
 e50cbcf6741684753da401722f337efacfa4a98f h: refs/heads/master i:   183677:
 f7d089c45ca60c4fec74c076187a6d45f792d02c   183675:
 64d75d34e5d1d232ae348289aa0c67167deb29a6   183671:
 1b8c484f313f215175ef6489b674ee2205bedb4d   183663:
 0b4b6b0b2dcabe091837da7ed35fc7173685bbaf   183647:
 35b7023fb60d4658c9f0d14d4ece9861c341bed3   183615:
 a4457552d8e6ca38ba992f1349aedb78e145fcb0   183551:
 6ab0706e1cf43703ac2ac97ddc1b092658e6250b v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/net/wireless/b43/phy_n.c | 38 ++++++++++++++++++++++++--
 2 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 92329aa57000..2d6d32044729 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 90b9738d85395d46ffdc961e1a0c80a17e8f4d32
+refs/heads/master: e50cbcf6741684753da401722f337efacfa4a98f
diff --git a/trunk/drivers/net/wireless/b43/phy_n.c b/trunk/drivers/net/wireless/b43/phy_n.c
index 126c0afa5da2..0e379427270a 100644
--- a/trunk/drivers/net/wireless/b43/phy_n.c
+++ b/trunk/drivers/net/wireless/b43/phy_n.c
@@ -344,6 +344,40 @@ static void b43_nphy_workarounds(struct b43_wldev *dev)
 	b43_phy_write(dev, B43_NPHY_PHASETR_B2, 0x20);
 }
 
+/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/PA%20override */
+static void b43_nphy_pa_override(struct b43_wldev *dev, bool enable)
+{
+	struct b43_phy_n *nphy = dev->phy.n;
+	enum ieee80211_band band;
+	u16 tmp;
+
+	if (!enable) {
+		nphy->rfctrl_intc1_save = b43_phy_read(dev,
+						       B43_NPHY_RFCTL_INTC1);
+		nphy->rfctrl_intc2_save = b43_phy_read(dev,
+						       B43_NPHY_RFCTL_INTC2);
+		band = b43_current_band(dev->wl);
+		if (dev->phy.rev >= 3) {
+			if (band == IEEE80211_BAND_5GHZ)
+				tmp = 0x600;
+			else
+				tmp = 0x480;
+		} else {
+			if (band == IEEE80211_BAND_5GHZ)
+				tmp = 0x180;
+			else
+				tmp = 0x120;
+		}
+		b43_phy_write(dev, B43_NPHY_RFCTL_INTC1, tmp);
+		b43_phy_write(dev, B43_NPHY_RFCTL_INTC2, tmp);
+	} else {
+		b43_phy_write(dev, B43_NPHY_RFCTL_INTC1,
+				nphy->rfctrl_intc1_save);
+		b43_phy_write(dev, B43_NPHY_RFCTL_INTC2,
+				nphy->rfctrl_intc2_save);
+	}
+}
+
 /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/BmacPhyClkFgc */
 static void b43_nphy_bmac_clock_fgc(struct b43_wldev *dev, bool force)
 {
@@ -964,10 +998,10 @@ int b43_phy_initn(struct b43_wldev *dev)
 
 	/* TODO N PHY MAC PHY Clock Set with argument 1 */
 
-	/* b43_nphy_pa_override(dev, false); */
+	b43_nphy_pa_override(dev, false);
 	b43_nphy_force_rf_sequence(dev, B43_RFSEQ_RX2TX);
 	b43_nphy_force_rf_sequence(dev, B43_RFSEQ_RESET2RX);
-	/* b43_nphy_pa_override(dev, true); */
+	b43_nphy_pa_override(dev, true);
 
 	b43_nphy_classifier(dev, 0, 0);
 	b43_nphy_read_clip_detection(dev, clip);