From: Jes Sorensen <Jes.Sorensen@redhat.com>
Date: Thu, 14 Apr 2016 18:58:45 +0000 (-0400)
Subject: rtl8xxxu: Reorder chip quirks to follow flow of 8192eu driver
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0486e80b2a447fc94687505ca106091b15e61651;p=openwrt%2Fstaging%2Fblogic.git

rtl8xxxu: Reorder chip quirks to follow flow of 8192eu driver

Another flow order change to match the vendor driver.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
---

diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c
index a9290d469759..9e9d3e351e65 100644
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c
@@ -7660,27 +7660,6 @@ static int rtl8xxxu_init_device(struct ieee80211_hw *hw)
 	priv->rf_mode_ag[0] = rtl8xxxu_read_rfreg(priv, RF_A,
 						  RF6052_REG_MODE_AG);
 
-	/*
-	 * Chip specific quirks
-	 */
-	if (priv->rtl_chip == RTL8723A) {
-		/* Fix USB interface interference issue */
-		rtl8xxxu_write8(priv, 0xfe40, 0xe0);
-		rtl8xxxu_write8(priv, 0xfe41, 0x8d);
-		rtl8xxxu_write8(priv, 0xfe42, 0x80);
-		rtl8xxxu_write32(priv, REG_TXDMA_OFFSET_CHK, 0xfd0320);
-
-		/* Reduce 80M spur */
-		rtl8xxxu_write32(priv, REG_AFE_XTAL_CTRL, 0x0381808d);
-		rtl8xxxu_write32(priv, REG_AFE_PLL_CTRL, 0xf0ffff83);
-		rtl8xxxu_write32(priv, REG_AFE_PLL_CTRL, 0xf0ffff82);
-		rtl8xxxu_write32(priv, REG_AFE_PLL_CTRL, 0xf0ffff83);
-	} else {
-		val32 = rtl8xxxu_read32(priv, REG_TXDMA_OFFSET_CHK);
-		val32 |= TXDMA_OFFSET_DROP_DATA_EN;
-		rtl8xxxu_write32(priv, REG_TXDMA_OFFSET_CHK, val32);
-	}
-
 	if (!macpower) {
 		/*
 		 * Set TX buffer boundary
@@ -7719,6 +7698,27 @@ static int rtl8xxxu_init_device(struct ieee80211_hw *hw)
 			goto exit;
 		}
 
+		/*
+		 * Chip specific quirks
+		 */
+		if (priv->rtl_chip == RTL8723A) {
+			/* Fix USB interface interference issue */
+			rtl8xxxu_write8(priv, 0xfe40, 0xe0);
+			rtl8xxxu_write8(priv, 0xfe41, 0x8d);
+			rtl8xxxu_write8(priv, 0xfe42, 0x80);
+			rtl8xxxu_write32(priv, REG_TXDMA_OFFSET_CHK, 0xfd0320);
+
+			/* Reduce 80M spur */
+			rtl8xxxu_write32(priv, REG_AFE_XTAL_CTRL, 0x0381808d);
+			rtl8xxxu_write32(priv, REG_AFE_PLL_CTRL, 0xf0ffff83);
+			rtl8xxxu_write32(priv, REG_AFE_PLL_CTRL, 0xf0ffff82);
+			rtl8xxxu_write32(priv, REG_AFE_PLL_CTRL, 0xf0ffff83);
+		} else {
+			val32 = rtl8xxxu_read32(priv, REG_TXDMA_OFFSET_CHK);
+			val32 |= TXDMA_OFFSET_DROP_DATA_EN;
+			rtl8xxxu_write32(priv, REG_TXDMA_OFFSET_CHK, val32);
+		}
+
 		/*
 		 * Presumably this is for 8188EU as well
 		 * Enable TX report and TX report timer