Commit 8d95c808 authored by Jes Sorensen's avatar Jes Sorensen Committed by Kalle Valo

rtl8xxxu: Use rtl_chip == RTL8188R to identify high PA parts

This is simpler than checking for RTL8188C && hi_pa.
Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 78a84219
...@@ -3054,6 +3054,7 @@ static int rtl8192cu_parse_efuse(struct rtl8xxxu_priv *priv) ...@@ -3054,6 +3054,7 @@ static int rtl8192cu_parse_efuse(struct rtl8xxxu_priv *priv)
if (efuse->rf_regulatory & 0x20) { if (efuse->rf_regulatory & 0x20) {
sprintf(priv->chip_name, "8188RU"); sprintf(priv->chip_name, "8188RU");
priv->rtl_chip = RTL8188R;
priv->hi_pa = 1; priv->hi_pa = 1;
} }
...@@ -4059,11 +4060,8 @@ static int rtl8192cu_init_phy_rf(struct rtl8xxxu_priv *priv) ...@@ -4059,11 +4060,8 @@ static int rtl8192cu_init_phy_rf(struct rtl8xxxu_priv *priv)
struct rtl8xxxu_rfregval *rftable; struct rtl8xxxu_rfregval *rftable;
int ret; int ret;
if (priv->rtl_chip == RTL8188C) { if (priv->rtl_chip == RTL8188R) {
if (priv->hi_pa) rftable = rtl8188ru_radioa_1t_highpa_table;
rftable = rtl8188ru_radioa_1t_highpa_table;
else
rftable = rtl8192cu_radioa_1t_init_table;
ret = rtl8xxxu_init_phy_rf(priv, rftable, RF_A); ret = rtl8xxxu_init_phy_rf(priv, rftable, RF_A);
} else if (priv->rf_paths == 1) { } else if (priv->rf_paths == 1) {
rftable = rtl8192cu_radioa_1t_init_table; rftable = rtl8192cu_radioa_1t_init_table;
...@@ -7219,7 +7217,7 @@ static int rtl8192cu_power_on(struct rtl8xxxu_priv *priv) ...@@ -7219,7 +7217,7 @@ static int rtl8192cu_power_on(struct rtl8xxxu_priv *priv)
/* /*
* Workaround for 8188RU LNA power leakage problem. * Workaround for 8188RU LNA power leakage problem.
*/ */
if (priv->rtl_chip == RTL8188C && priv->hi_pa) { if (priv->rtl_chip == RTL8188R) {
val32 = rtl8xxxu_read32(priv, REG_FPGA0_XCD_RF_PARM); val32 = rtl8xxxu_read32(priv, REG_FPGA0_XCD_RF_PARM);
val32 &= ~BIT(1); val32 &= ~BIT(1);
rtl8xxxu_write32(priv, REG_FPGA0_XCD_RF_PARM, val32); rtl8xxxu_write32(priv, REG_FPGA0_XCD_RF_PARM, val32);
...@@ -7323,7 +7321,7 @@ static void rtl8xxxu_power_off(struct rtl8xxxu_priv *priv) ...@@ -7323,7 +7321,7 @@ static void rtl8xxxu_power_off(struct rtl8xxxu_priv *priv)
/* /*
* Workaround for 8188RU LNA power leakage problem. * Workaround for 8188RU LNA power leakage problem.
*/ */
if (priv->rtl_chip == RTL8188C && priv->hi_pa) { if (priv->rtl_chip == RTL8188R) {
val32 = rtl8xxxu_read32(priv, REG_FPGA0_XCD_RF_PARM); val32 = rtl8xxxu_read32(priv, REG_FPGA0_XCD_RF_PARM);
val32 |= BIT(1); val32 |= BIT(1);
rtl8xxxu_write32(priv, REG_FPGA0_XCD_RF_PARM, val32); rtl8xxxu_write32(priv, REG_FPGA0_XCD_RF_PARM, val32);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment