From 66c5696cdf9599ccef652a651f52c0f7f53da44a Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Tue, 26 Jun 2018 15:39:38 +0200
Subject: mac80211: rtl8xxxu: drop support patches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

After a very enlightening but unfortunately far too short exchange with Jes
we mutually agreed to drop the patches. They are unfortunately not ready
yet.

Acked-by: Rafał Miłecki <rafal@milecki.pl>
Signed-off-by: John Crispin <john@phrozen.org>
---
 ...xu-Add-PHY-IQ-calibration-code-for-8188eu.patch | 521 ---------------------
 1 file changed, 521 deletions(-)
 delete mode 100644 package/kernel/mac80211/patches/653-0025-rtl8xxxu-Add-PHY-IQ-calibration-code-for-8188eu.patch

(limited to 'package/kernel/mac80211/patches/653-0025-rtl8xxxu-Add-PHY-IQ-calibration-code-for-8188eu.patch')

diff --git a/package/kernel/mac80211/patches/653-0025-rtl8xxxu-Add-PHY-IQ-calibration-code-for-8188eu.patch b/package/kernel/mac80211/patches/653-0025-rtl8xxxu-Add-PHY-IQ-calibration-code-for-8188eu.patch
deleted file mode 100644
index ce76a67d9e..0000000000
--- a/package/kernel/mac80211/patches/653-0025-rtl8xxxu-Add-PHY-IQ-calibration-code-for-8188eu.patch
+++ /dev/null
@@ -1,521 +0,0 @@
-From 9a3c53da5228607375ab69d6e3cbc375f18a4f82 Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Thu, 21 Jul 2016 17:25:56 -0400
-Subject: [PATCH] rtl8xxxu: Add PHY IQ calibration code for 8188eu
-
-The vendor driver for 8188eu is a bizarre modern style code for path A
-and old-style code for path B. Most likely because the 8188eu is a
-1T1R part which never gets to the path B code.
-
-Eventually we should look into unifying all the IQ calibration code.
-
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c | 489 +++++++++++++++++++++
- 1 file changed, 489 insertions(+)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-@@ -384,6 +384,494 @@ static int rtl8188eu_init_phy_rf(struct
- 	return ret;
- }
- 
-+static int rtl8188eu_iqk_path_a(struct rtl8xxxu_priv *priv)
-+{
-+	u32 reg_eac, reg_e94, reg_e9c;
-+	int result = 0;
-+
-+	/* Path A IQK setting */
-+	rtl8xxxu_write32(priv, REG_TX_IQK_TONE_A, 0x10008c1c);
-+	rtl8xxxu_write32(priv, REG_RX_IQK_TONE_A, 0x30008c1c);
-+
-+	rtl8xxxu_write32(priv, REG_TX_IQK_PI_A, 0x8214032a);
-+	rtl8xxxu_write32(priv, REG_RX_IQK_PI_A, 0x28160000);
-+
-+	/* LO calibration setting */
-+	rtl8xxxu_write32(priv, REG_IQK_AGC_RSP, 0x00462911);
-+
-+	/* One shot, path A LOK & IQK */
-+	rtl8xxxu_write32(priv, REG_IQK_AGC_PTS, 0xf9000000);
-+	rtl8xxxu_write32(priv, REG_IQK_AGC_PTS, 0xf8000000);
-+
-+	mdelay(10);
-+
-+	/* Check failed */
-+	reg_eac = rtl8xxxu_read32(priv, REG_RX_POWER_AFTER_IQK_A_2);
-+	reg_e94 = rtl8xxxu_read32(priv, REG_TX_POWER_BEFORE_IQK_A);
-+	reg_e9c = rtl8xxxu_read32(priv, REG_TX_POWER_AFTER_IQK_A);
-+
-+	if (!(reg_eac & BIT(28)) &&
-+	    ((reg_e94 & 0x03ff0000) != 0x01420000) &&
-+	    ((reg_e9c & 0x03ff0000) != 0x00420000))
-+		result |= 0x01;
-+
-+	return result;
-+}
-+
-+static int rtl8188eu_rx_iqk_path_a(struct rtl8xxxu_priv *priv)
-+{
-+	u32 reg_ea4, reg_eac, reg_e94, reg_e9c, val32;
-+	int result = 0;
-+
-+	/* Leave IQK mode */
-+	rtl8xxxu_write32(priv, REG_FPGA0_IQK, 0x00);
-+
-+	/* Enable path A PA in TX IQK mode */
-+	rtl8xxxu_write_rfreg(priv, RF_A, RF6052_REG_WE_LUT, 0x800a0);
-+	rtl8xxxu_write_rfreg(priv, RF_A, RF6052_REG_RCK_OS, 0x30000);
-+	rtl8xxxu_write_rfreg(priv, RF_A, RF6052_REG_TXPA_G1, 0x0000f);
-+	rtl8xxxu_write_rfreg(priv, RF_A, RF6052_REG_TXPA_G2, 0xf117b);
-+
-+	/* PA/PAD control by 0x56, and set = 0x0 */
-+	rtl8xxxu_write_rfreg(priv, RF_A, RF6052_REG_UNKNOWN_DF, 0x00980);
-+	rtl8xxxu_write_rfreg(priv, RF_A, RF6052_REG_UNKNOWN_56, 0x51000);
-+
-+	/* Enter IQK mode */
-+	rtl8xxxu_write32(priv, REG_FPGA0_IQK, 0x80800000);
-+
-+	/* TX IQK setting */
-+	rtl8xxxu_write32(priv, REG_TX_IQK, 0x01007c00);
-+	rtl8xxxu_write32(priv, REG_RX_IQK, 0x81004800);
-+
-+	/* path-A IQK setting */
-+	rtl8xxxu_write32(priv, REG_TX_IQK_TONE_A, 0x10008c1c);
-+	rtl8xxxu_write32(priv, REG_RX_IQK_TONE_A, 0x30008c1c);
-+
-+	rtl8xxxu_write32(priv, REG_TX_IQK_PI_A, 0x82160c1f);
-+	rtl8xxxu_write32(priv, REG_RX_IQK_PI_A, 0x28160000);
-+
-+	/* LO calibration setting */
-+	rtl8xxxu_write32(priv, REG_IQK_AGC_RSP, 0x0046a911);
-+
-+	/* One shot, path A LOK & IQK */
-+	rtl8xxxu_write32(priv, REG_IQK_AGC_PTS, 0xf9000000);
-+	rtl8xxxu_write32(priv, REG_IQK_AGC_PTS, 0xf8000000);
-+
-+	mdelay(10);
-+
-+	/* Check failed */
-+	reg_eac = rtl8xxxu_read32(priv, REG_RX_POWER_AFTER_IQK_A_2);
-+	reg_e94 = rtl8xxxu_read32(priv, REG_TX_POWER_BEFORE_IQK_A);
-+	reg_e9c = rtl8xxxu_read32(priv, REG_TX_POWER_AFTER_IQK_A);
-+
-+	if (!(reg_eac & BIT(28)) &&
-+	    ((reg_e94 & 0x03ff0000) != 0x01420000) &&
-+	    ((reg_e9c & 0x03ff0000) != 0x00420000)) {
-+		result |= 0x01;
-+	} else {
-+		/* PA/PAD controlled by 0x0 */
-+		rtl8xxxu_write32(priv, REG_FPGA0_IQK, 0x00000000);
-+		rtl8xxxu_write_rfreg(priv, RF_A, RF6052_REG_UNKNOWN_DF, 0x180);
-+		goto out;
-+	}
-+
-+	val32 = 0x80007c00 |
-+		(reg_e94 & 0x03ff0000) | ((reg_e9c >> 16) & 0x03ff);
-+	rtl8xxxu_write32(priv, REG_TX_IQK, val32);
-+
-+	/* Modify RX IQK mode table */
-+	rtl8xxxu_write32(priv, REG_FPGA0_IQK, 0x00000000);
-+
-+	rtl8xxxu_write_rfreg(priv, RF_A, RF6052_REG_WE_LUT, 0x800a0);
-+	rtl8xxxu_write_rfreg(priv, RF_A, RF6052_REG_RCK_OS, 0x30000);
-+	rtl8xxxu_write_rfreg(priv, RF_A, RF6052_REG_TXPA_G1, 0x0000f);
-+	rtl8xxxu_write_rfreg(priv, RF_A, RF6052_REG_TXPA_G2, 0xf7ffa);
-+
-+	/* Enter IQK mode */
-+	rtl8xxxu_write32(priv, REG_FPGA0_IQK, 0x80800000);
-+
-+	/* IQK setting */
-+	rtl8xxxu_write32(priv, REG_RX_IQK, 0x01004800);
-+
-+	/* Path A IQK setting */
-+	rtl8xxxu_write32(priv, REG_TX_IQK_TONE_A, 0x38008c1c);
-+	rtl8xxxu_write32(priv, REG_RX_IQK_TONE_A, 0x18008c1c);
-+
-+	rtl8xxxu_write32(priv, REG_TX_IQK_PI_A, 0x82160c05);
-+	rtl8xxxu_write32(priv, REG_RX_IQK_PI_A, 0x28160c1f);
-+
-+	/* LO calibration setting */
-+	rtl8xxxu_write32(priv, REG_IQK_AGC_RSP, 0x0046a911);
-+
-+	/* One shot, path A LOK & IQK */
-+	rtl8xxxu_write32(priv, REG_IQK_AGC_PTS, 0xf9000000);
-+	rtl8xxxu_write32(priv, REG_IQK_AGC_PTS, 0xf8000000);
-+
-+	mdelay(10);
-+
-+	reg_eac = rtl8xxxu_read32(priv, REG_RX_POWER_AFTER_IQK_A_2);
-+	reg_ea4 = rtl8xxxu_read32(priv, REG_RX_POWER_BEFORE_IQK_A_2);
-+
-+	rtl8xxxu_write32(priv, REG_FPGA0_IQK, 0x00000000);
-+	rtl8xxxu_write_rfreg(priv, RF_A, RF6052_REG_UNKNOWN_DF, 0x180);
-+
-+	if (!(reg_eac & BIT(27)) &&
-+	    ((reg_ea4 & 0x03ff0000) != 0x01320000) &&
-+	    ((reg_eac & 0x03ff0000) != 0x00360000))
-+		result |= 0x02;
-+	else
-+		dev_warn(&priv->udev->dev, "%s: Path A RX IQK failed!\n",
-+			 __func__);
-+
-+out:
-+	return result;
-+}
-+
-+static int rtl8188eu_iqk_path_b(struct rtl8xxxu_priv *priv)
-+{
-+	u32 reg_eac, reg_eb4, reg_ebc, reg_ec4, reg_ecc;
-+	int result = 0;
-+
-+	rtl8xxxu_write32(priv, REG_IQK_AGC_CONT, 0x00000002);
-+	rtl8xxxu_write32(priv, REG_IQK_AGC_CONT, 0x00000000);
-+
-+	mdelay(1);
-+
-+	/* Check failed */
-+	reg_eac = rtl8xxxu_read32(priv, REG_RX_POWER_AFTER_IQK_A_2);
-+	reg_eb4 = rtl8xxxu_read32(priv, REG_TX_POWER_BEFORE_IQK_B);
-+	reg_ebc = rtl8xxxu_read32(priv, REG_TX_POWER_AFTER_IQK_B);
-+	reg_ec4 = rtl8xxxu_read32(priv, REG_RX_POWER_BEFORE_IQK_B_2);
-+	reg_ecc = rtl8xxxu_read32(priv, REG_RX_POWER_AFTER_IQK_B_2);
-+
-+	if (!(reg_eac & BIT(31)) &&
-+	    ((reg_eb4 & 0x03ff0000) != 0x01420000) &&
-+	    ((reg_ebc & 0x03ff0000) != 0x00420000))
-+		result |= 0x01;
-+	else
-+		dev_warn(&priv->udev->dev, "%s: Path B IQK failed!\n",
-+			 __func__);
-+
-+	if (!(reg_eac & BIT(30)) &&
-+	    ((reg_ec4 & 0x03ff0000) != 0x01320000) &&
-+	    ((reg_ecc & 0x03ff0000) != 0x00360000))
-+		result |= 0x01;
-+	else
-+		dev_warn(&priv->udev->dev, "%s: Path B RX IQK failed!\n",
-+			 __func__);
-+
-+	return result;
-+}
-+
-+static void rtl8188eu_phy_iqcalibrate(struct rtl8xxxu_priv *priv,
-+				      int result[][8], int t)
-+{
-+	struct device *dev = &priv->udev->dev;
-+	u32 i, val32;
-+	int path_a_ok, path_b_ok;
-+	int retry = 2;
-+	const u32 adda_regs[RTL8XXXU_ADDA_REGS] = {
-+		REG_FPGA0_XCD_SWITCH_CTRL, REG_BLUETOOTH,
-+		REG_RX_WAIT_CCA, REG_TX_CCK_RFON,
-+		REG_TX_CCK_BBON, REG_TX_OFDM_RFON,
-+		REG_TX_OFDM_BBON, REG_TX_TO_RX,
-+		REG_TX_TO_TX, REG_RX_CCK,
-+		REG_RX_OFDM, REG_RX_WAIT_RIFS,
-+		REG_RX_TO_RX, REG_STANDBY,
-+		REG_SLEEP, REG_PMPD_ANAEN
-+	};
-+	const u32 iqk_mac_regs[RTL8XXXU_MAC_REGS] = {
-+		REG_TXPAUSE, REG_BEACON_CTRL,
-+		REG_BEACON_CTRL_1, REG_GPIO_MUXCFG
-+	};
-+	const u32 iqk_bb_regs[RTL8XXXU_BB_REGS] = {
-+		REG_OFDM0_TRX_PATH_ENABLE, REG_OFDM0_TR_MUX_PAR,
-+		REG_FPGA0_XCD_RF_SW_CTRL, REG_CONFIG_ANT_A, REG_CONFIG_ANT_B,
-+		REG_FPGA0_XAB_RF_SW_CTRL, REG_FPGA0_XA_RF_INT_OE,
-+		REG_FPGA0_XB_RF_INT_OE, REG_FPGA0_RF_MODE
-+	};
-+
-+	/*
-+	 * Note: IQ calibration must be performed after loading
-+	 *       PHY_REG.txt , and radio_a, radio_b.txt
-+	 */
-+
-+	if (t == 0) {
-+		/* Save ADDA parameters, turn Path A ADDA on */
-+		rtl8xxxu_save_regs(priv, adda_regs, priv->adda_backup,
-+				   RTL8XXXU_ADDA_REGS);
-+		rtl8xxxu_save_mac_regs(priv, iqk_mac_regs, priv->mac_backup);
-+		rtl8xxxu_save_regs(priv, iqk_bb_regs,
-+				   priv->bb_backup, RTL8XXXU_BB_REGS);
-+	}
-+
-+	rtl8xxxu_path_adda_on(priv, adda_regs, true);
-+
-+	if (t == 0) {
-+		val32 = rtl8xxxu_read32(priv, REG_FPGA0_XA_HSSI_PARM1);
-+		if (val32 & FPGA0_HSSI_PARM1_PI)
-+			priv->pi_enabled = 1;
-+	}
-+
-+	if (!priv->pi_enabled) {
-+		/* Switch BB to PI mode to do IQ Calibration. */
-+		rtl8xxxu_write32(priv, REG_FPGA0_XA_HSSI_PARM1, 0x01000100);
-+		rtl8xxxu_write32(priv, REG_FPGA0_XB_HSSI_PARM1, 0x01000100);
-+	}
-+
-+	val32 = rtl8xxxu_read32(priv, REG_FPGA0_RF_MODE);
-+	val32 &= ~FPGA_RF_MODE_CCK;
-+	rtl8xxxu_write32(priv, REG_FPGA0_RF_MODE, val32);
-+
-+	rtl8xxxu_write32(priv, REG_OFDM0_TRX_PATH_ENABLE, 0x03a05600);
-+	rtl8xxxu_write32(priv, REG_OFDM0_TR_MUX_PAR, 0x000800e4);
-+	rtl8xxxu_write32(priv, REG_FPGA0_XCD_RF_SW_CTRL, 0x22204000);
-+
-+	if (!priv->no_pape) {
-+		val32 = rtl8xxxu_read32(priv, REG_FPGA0_XAB_RF_SW_CTRL);
-+		val32 |= (FPGA0_RF_PAPE |
-+			  (FPGA0_RF_PAPE << FPGA0_RF_BD_CTRL_SHIFT));
-+		rtl8xxxu_write32(priv, REG_FPGA0_XAB_RF_SW_CTRL, val32);
-+	}
-+
-+	val32 = rtl8xxxu_read32(priv, REG_FPGA0_XA_RF_INT_OE);
-+	val32 &= ~BIT(10);
-+	rtl8xxxu_write32(priv, REG_FPGA0_XA_RF_INT_OE, val32);
-+	val32 = rtl8xxxu_read32(priv, REG_FPGA0_XB_RF_INT_OE);
-+	val32 &= ~BIT(10);
-+	rtl8xxxu_write32(priv, REG_FPGA0_XB_RF_INT_OE, val32);
-+
-+	if (priv->tx_paths > 1) {
-+		rtl8xxxu_write32(priv, REG_FPGA0_XA_LSSI_PARM, 0x00010000);
-+		rtl8xxxu_write32(priv, REG_FPGA0_XB_LSSI_PARM, 0x00010000);
-+	}
-+
-+	/* MAC settings */
-+	rtl8xxxu_mac_calibration(priv, iqk_mac_regs, priv->mac_backup);
-+
-+	/* Page B init */
-+	rtl8xxxu_write32(priv, REG_CONFIG_ANT_A, 0x0f600000);
-+
-+	if (priv->tx_paths > 1)
-+		rtl8xxxu_write32(priv, REG_CONFIG_ANT_B, 0x0f600000);
-+
-+	/* IQ calibration setting */
-+	rtl8xxxu_write32(priv, REG_FPGA0_IQK, 0x80800000);
-+	rtl8xxxu_write32(priv, REG_TX_IQK, 0x01007c00);
-+	rtl8xxxu_write32(priv, REG_RX_IQK, 0x81004800);
-+
-+	for (i = 0; i < retry; i++) {
-+		path_a_ok = rtl8188eu_iqk_path_a(priv);
-+		if (path_a_ok == 0x01) {
-+			val32 = rtl8xxxu_read32(priv,
-+						REG_TX_POWER_BEFORE_IQK_A);
-+			result[t][0] = (val32 >> 16) & 0x3ff;
-+			val32 = rtl8xxxu_read32(priv,
-+						REG_TX_POWER_AFTER_IQK_A);
-+			result[t][1] = (val32 >> 16) & 0x3ff;
-+			break;
-+		}
-+	}
-+
-+	if (!path_a_ok)
-+		dev_dbg(dev, "%s: Path A TX IQK failed!\n", __func__);
-+
-+	for (i = 0; i < retry; i++) {
-+		path_a_ok = rtl8188eu_rx_iqk_path_a(priv);
-+		if (path_a_ok == 0x03) {
-+			val32 = rtl8xxxu_read32(priv,
-+						REG_RX_POWER_BEFORE_IQK_A_2);
-+			result[t][2] = (val32 >> 16) & 0x3ff;
-+			val32 = rtl8xxxu_read32(priv,
-+						REG_RX_POWER_AFTER_IQK_A_2);
-+			result[t][3] = (val32 >> 16) & 0x3ff;
-+
-+			break;
-+		}
-+	}
-+
-+	if (!path_a_ok)
-+		dev_dbg(dev, "%s: Path A RX IQK failed!\n", __func__);
-+
-+	/*
-+	 * Path B calibration code in the vendor driver seems to be
-+	 * old style and not updated for the 8188eu since it's a 1T1R
-+	 * part. Keeping the code here in sync with the vendor code
-+	 * to not divert unncessarily, but probably would be good to
-+	 * look into modernizing all the code including that for the
-+	 * old gen1 devices
-+	 */
-+	if (priv->tx_paths > 1) {
-+		/*
-+		 * Path A into standby
-+		 */
-+		rtl8xxxu_write32(priv, REG_FPGA0_IQK, 0x0);
-+		rtl8xxxu_write32(priv, REG_FPGA0_XA_LSSI_PARM, 0x00010000);
-+		rtl8xxxu_write32(priv, REG_FPGA0_IQK, 0x80800000);
-+
-+		/* Turn Path B ADDA on */
-+		rtl8xxxu_path_adda_on(priv, adda_regs, false);
-+
-+		for (i = 0; i < retry; i++) {
-+			path_b_ok = rtl8188eu_iqk_path_b(priv);
-+			if (path_b_ok == 0x03) {
-+				val32 = rtl8xxxu_read32(priv, REG_TX_POWER_BEFORE_IQK_B);
-+				result[t][4] = (val32 >> 16) & 0x3ff;
-+				val32 = rtl8xxxu_read32(priv, REG_TX_POWER_AFTER_IQK_B);
-+				result[t][5] = (val32 >> 16) & 0x3ff;
-+				val32 = rtl8xxxu_read32(priv, REG_RX_POWER_BEFORE_IQK_B_2);
-+				result[t][6] = (val32 >> 16) & 0x3ff;
-+				val32 = rtl8xxxu_read32(priv, REG_RX_POWER_AFTER_IQK_B_2);
-+				result[t][7] = (val32 >> 16) & 0x3ff;
-+				break;
-+			} else if (i == (retry - 1) && path_b_ok == 0x01) {
-+				/* TX IQK OK */
-+				val32 = rtl8xxxu_read32(priv, REG_TX_POWER_BEFORE_IQK_B);
-+				result[t][4] = (val32 >> 16) & 0x3ff;
-+				val32 = rtl8xxxu_read32(priv, REG_TX_POWER_AFTER_IQK_B);
-+				result[t][5] = (val32 >> 16) & 0x3ff;
-+			}
-+		}
-+
-+		if (!path_b_ok)
-+			dev_dbg(dev, "%s: Path B IQK failed!\n", __func__);
-+	}
-+
-+	/* Back to BB mode, load original value */
-+	rtl8xxxu_write32(priv, REG_FPGA0_IQK, 0);
-+
-+	if (t) {
-+		if (!priv->pi_enabled) {
-+			/*
-+			 * Switch back BB to SI mode after finishing
-+			 * IQ Calibration
-+			 */
-+			val32 = 0x01000000;
-+			rtl8xxxu_write32(priv, REG_FPGA0_XA_HSSI_PARM1, val32);
-+			rtl8xxxu_write32(priv, REG_FPGA0_XB_HSSI_PARM1, val32);
-+		}
-+
-+		/* Reload ADDA power saving parameters */
-+		rtl8xxxu_restore_regs(priv, adda_regs, priv->adda_backup,
-+				      RTL8XXXU_ADDA_REGS);
-+
-+		/* Reload MAC parameters */
-+		rtl8xxxu_restore_mac_regs(priv, iqk_mac_regs, priv->mac_backup);
-+
-+		/* Reload BB parameters */
-+		rtl8xxxu_restore_regs(priv, iqk_bb_regs,
-+				      priv->bb_backup, RTL8XXXU_BB_REGS);
-+
-+		/* Restore RX initial gain */
-+		rtl8xxxu_write32(priv, REG_FPGA0_XA_LSSI_PARM, 0x00032ed3);
-+
-+		if (priv->tx_paths > 1) {
-+			rtl8xxxu_write32(priv, REG_FPGA0_XB_LSSI_PARM,
-+					 0x00032ed3);
-+		}
-+
-+		/* Load 0xe30 IQC default value */
-+		rtl8xxxu_write32(priv, REG_TX_IQK_TONE_A, 0x01008c00);
-+		rtl8xxxu_write32(priv, REG_RX_IQK_TONE_A, 0x01008c00);
-+	}
-+}
-+
-+static void rtl8188eu_phy_iq_calibrate(struct rtl8xxxu_priv *priv)
-+{
-+	struct device *dev = &priv->udev->dev;
-+	int result[4][8];	/* last is final result */
-+	int i, candidate;
-+	bool path_a_ok, path_b_ok;
-+	u32 reg_e94, reg_e9c, reg_ea4, reg_eac;
-+	u32 reg_eb4, reg_ebc, reg_ec4, reg_ecc;
-+	bool simu;
-+
-+	memset(result, 0, sizeof(result));
-+	result[3][0] = 0x100;
-+	result[3][2] = 0x100;
-+	result[3][4] = 0x100;
-+	result[3][6] = 0x100;
-+
-+	candidate = -1;
-+
-+	path_a_ok = false;
-+	path_b_ok = false;
-+
-+	for (i = 0; i < 3; i++) {
-+		rtl8188eu_phy_iqcalibrate(priv, result, i);
-+
-+		if (i == 1) {
-+			simu = rtl8xxxu_gen2_simularity_compare(priv,
-+								result, 0, 1);
-+			if (simu) {
-+				candidate = 0;
-+				break;
-+			}
-+		}
-+
-+		if (i == 2) {
-+			simu = rtl8xxxu_gen2_simularity_compare(priv,
-+								result, 0, 2);
-+			if (simu) {
-+				candidate = 0;
-+				break;
-+			}
-+
-+			simu = rtl8xxxu_gen2_simularity_compare(priv,
-+								result, 1, 2);
-+			if (simu)
-+				candidate = 1;
-+			else
-+				candidate = 3;
-+		}
-+	}
-+
-+	for (i = 0; i < 4; i++) {
-+		reg_e94 = result[i][0];
-+		reg_e9c = result[i][1];
-+		reg_ea4 = result[i][2];
-+		reg_eb4 = result[i][4];
-+		reg_ebc = result[i][5];
-+		reg_ec4 = result[i][6];
-+	}
-+
-+	if (candidate >= 0) {
-+		reg_e94 = result[candidate][0];
-+		priv->rege94 =  reg_e94;
-+		reg_e9c = result[candidate][1];
-+		priv->rege9c = reg_e9c;
-+		reg_ea4 = result[candidate][2];
-+		reg_eac = result[candidate][3];
-+		reg_eb4 = result[candidate][4];
-+		priv->regeb4 = reg_eb4;
-+		reg_ebc = result[candidate][5];
-+		priv->regebc = reg_ebc;
-+		reg_ec4 = result[candidate][6];
-+		reg_ecc = result[candidate][7];
-+		dev_dbg(dev, "%s: candidate is %x\n", __func__, candidate);
-+		dev_dbg(dev,
-+			"%s: e94 =%x e9c=%x ea4=%x eac=%x eb4=%x ebc=%x ec4=%x "
-+			"ecc=%x\n ", __func__, reg_e94, reg_e9c,
-+			reg_ea4, reg_eac, reg_eb4, reg_ebc, reg_ec4, reg_ecc);
-+		path_a_ok = true;
-+		path_b_ok = true;
-+	} else {
-+		reg_e94 = reg_eb4 = priv->rege94 = priv->regeb4 = 0x100;
-+		reg_e9c = reg_ebc = priv->rege9c = priv->regebc = 0x0;
-+	}
-+
-+	if (reg_e94 && candidate >= 0)
-+		rtl8xxxu_fill_iqk_matrix_a(priv, path_a_ok, result,
-+					   candidate, (reg_ea4 == 0));
-+
-+	if (priv->rf_paths > 1 && reg_eb4)
-+		rtl8xxxu_fill_iqk_matrix_b(priv, path_b_ok, result,
-+					   candidate, (reg_ec4 == 0));
-+
-+	rtl8xxxu_save_regs(priv, rtl8xxxu_iqk_phy_iq_bb_reg,
-+			   priv->bb_recovery_backup, RTL8XXXU_BB_REGS);
-+}
-+
- static void rtl8188e_disabled_to_emu(struct rtl8xxxu_priv *priv)
- {
- 	u16 val16;
-@@ -520,6 +1008,7 @@ struct rtl8xxxu_fileops rtl8188eu_fops =
- 	.llt_init = rtl8xxxu_auto_llt_table,
- 	.init_phy_bb = rtl8188eu_init_phy_bb,
- 	.init_phy_rf = rtl8188eu_init_phy_rf,
-+	.phy_iq_calibrate = rtl8188eu_phy_iq_calibrate,
- 	.parse_rx_desc = rtl8xxxu_parse_rxdesc16,
- 	.usb_quirks = rtl8188e_usb_quirks,
- 	.writeN_block_size = 128,
-- 
cgit v1.2.3