Skip to content

Commit

Permalink
staging: rtl8188eu: simplify rtl88eu_phy_iq_calibrate
Browse files Browse the repository at this point in the history
The boolean is2t variable in rtl88eu_phy_iq_calibrate is always false.
Remove some code that's unused in this case.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
  • Loading branch information
martin-kaiser authored and intel-lab-lkp committed Jul 25, 2021
1 parent bbf61fb commit fd8745a
Showing 1 changed file with 1 addition and 56 deletions.
57 changes: 1 addition & 56 deletions drivers/staging/rtl8188eu/hal/phy.c
Original file line number Diff line number Diff line change
Expand Up @@ -703,53 +703,6 @@ static void patha_fill_iqk(struct adapter *adapt, bool iqkok, s32 result[][8],
}
}

static void pathb_fill_iqk(struct adapter *adapt, bool iqkok, s32 result[][8],
u8 final_candidate, bool txonly)
{
u32 oldval_1, x, tx1_a, reg;
s32 y, tx1_c;

if (final_candidate == 0xFF) {
return;
} else if (iqkok) {
oldval_1 = (phy_query_bb_reg(adapt, rOFDM0_XBTxIQImbalance, bMaskDWord) >> 22) & 0x3FF;

x = result[final_candidate][4];
if ((x & 0x00000200) != 0)
x = x | 0xFFFFFC00;
tx1_a = (x * oldval_1) >> 8;
phy_set_bb_reg(adapt, rOFDM0_XBTxIQImbalance, 0x3FF, tx1_a);

phy_set_bb_reg(adapt, rOFDM0_ECCAThreshold, BIT(27),
((x * oldval_1 >> 7) & 0x1));

y = result[final_candidate][5];
if ((y & 0x00000200) != 0)
y = y | 0xFFFFFC00;

tx1_c = (y * oldval_1) >> 8;

phy_set_bb_reg(adapt, rOFDM0_XDTxAFE, 0xF0000000,
((tx1_c & 0x3C0) >> 6));
phy_set_bb_reg(adapt, rOFDM0_XBTxIQImbalance, 0x003F0000,
(tx1_c & 0x3F));
phy_set_bb_reg(adapt, rOFDM0_ECCAThreshold, BIT(25),
((y * oldval_1 >> 7) & 0x1));

if (txonly)
return;

reg = result[final_candidate][6];
phy_set_bb_reg(adapt, rOFDM0_XBRxIQImbalance, 0x3FF, reg);

reg = result[final_candidate][7] & 0x3F;
phy_set_bb_reg(adapt, rOFDM0_XBRxIQImbalance, 0xFC00, reg);

reg = (result[final_candidate][7] >> 6) & 0xF;
phy_set_bb_reg(adapt, rOFDM0_AGCRSSITable, 0x0000F000, reg);
}
}

static void save_adda_registers(struct adapter *adapt, const u32 *addareg,
u32 *backup, u32 register_num)
{
Expand Down Expand Up @@ -1159,9 +1112,6 @@ void rtl88eu_phy_iq_calibrate(struct adapter *adapt, bool recovery)
rOFDM0_XATxIQImbalance, rOFDM0_XBTxIQImbalance,
rOFDM0_XCTxAFE, rOFDM0_XDTxAFE,
rOFDM0_RxIQExtAnta};
bool is2t;

is2t = false;

if (!(dm_odm->SupportAbility & ODM_RF_CALIBRATION))
return;
Expand All @@ -1184,7 +1134,7 @@ void rtl88eu_phy_iq_calibrate(struct adapter *adapt, bool recovery)
is13simular = false;

for (i = 0; i < 3; i++) {
phy_iq_calibrate(adapt, result, i, is2t);
phy_iq_calibrate(adapt, result, i, false);

if (i == 1) {
is12simular = simularity_compare(adapt, result, 0, 1);
Expand Down Expand Up @@ -1239,11 +1189,6 @@ void rtl88eu_phy_iq_calibrate(struct adapter *adapt, bool recovery)
if (reg_e94 != 0)
patha_fill_iqk(adapt, pathaok, result, final,
(reg_ea4 == 0));
if (is2t) {
if (reg_eb4 != 0)
pathb_fill_iqk(adapt, pathbok, result, final,
(reg_ec4 == 0));
}

if (final < 4) {
for (i = 0; i < IQK_Matrix_REG_NUM; i++)
Expand Down

0 comments on commit fd8745a

Please sign in to comment.