From: Jes Sorensen Date: Mon, 29 Feb 2016 22:04:37 +0000 (-0500) Subject: rtl8xxxu: Do LC calibration before IQK calibration X-Git-Tag: v4.6-rc1~91^2~61^2~74 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fa0f2d481d178fa2bf44f9488a695ab56d4e78f6;p=karo-tx-linux.git rtl8xxxu: Do LC calibration before IQK calibration This matches the flow of the vendor driver for newer hardware, and doesn't seem to cause issues for the older parts. Signed-off-by: Jes Sorensen Signed-off-by: Kalle Valo --- diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c index cfd016c5b7ef..62537bd824a5 100644 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c @@ -5803,6 +5803,8 @@ static int rtl8xxxu_init_device(struct ieee80211_hw *hw) rtl8xxxu_write16(priv, REG_FAST_EDCA_CTRL, 0); + rtl8723a_phy_lc_calibrate(priv); + priv->fops->phy_iq_calibrate(priv); /* @@ -5810,8 +5812,6 @@ static int rtl8xxxu_init_device(struct ieee80211_hw *hw) */ rtl8xxxu_write_rfreg(priv, RF_A, RF6052_REG_T_METER, 0x60); - rtl8723a_phy_lc_calibrate(priv); - /* Init BT hw config. */ rtl8xxxu_init_bt(priv);