Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d698dec authored by Jes Sorensen's avatar Jes Sorensen Committed by Kalle Valo
Browse files

rtl8xxxu: Handle S0S1 register in lc_calibrate() 



Newer chips (8723bu/8192eu) has S0S1 settings which needs to be dealt
with during LC calibration.

Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent e1547c53

drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c

+7 −0
Original line number Diff line number Diff line
@@ -4835,12 +4835,17 @@ static void rtl8723a_phy_lc_calibrate(struct rtl8xxxu_priv *priv) 
	}



	/* Start LC calibration */

	if (priv->fops->has_s0s1)

		rtl8xxxu_write_rfreg(priv, RF_A, RF6052_REG_S0S1, 0xdfbe0);

	val32 = rtl8xxxu_read_rfreg(priv, RF_A, RF6052_REG_MODE_AG);

	val32 |= 0x08000;

	rtl8xxxu_write_rfreg(priv, RF_A, RF6052_REG_MODE_AG, val32);



	msleep(100);



	if (priv->fops->has_s0s1)

		rtl8xxxu_write_rfreg(priv, RF_A, RF6052_REG_S0S1, 0xdffe0);



	/* Restore original parameters */

	if (lstf & OFDM_LSTF_MASK) {

		/* Path-A */
@@ -7359,6 +7364,7 @@ static struct rtl8xxxu_fileops rtl8723bu_fops = { 
	.writeN_block_size = 1024,

	.mbox_ext_reg = REG_HMBOX_EXT0_8723B,

	.mbox_ext_width = 4,

	.has_s0s1 = 1,

	.adda_1t_init = 0x01c00014,

	.adda_1t_path_on = 0x01c00014,

	.adda_2t_path_on_a = 0x01c00014,
@@ -7393,6 +7399,7 @@ static struct rtl8xxxu_fileops rtl8192eu_fops = { 
	.writeN_block_size = 128,

	.mbox_ext_reg = REG_HMBOX_EXT0_8723B,

	.mbox_ext_width = 4,

	.has_s0s1 = 1,

	.adda_1t_init = 0x0fc01616,

	.adda_1t_path_on = 0x0fc01616,

	.adda_2t_path_on_a = 0x0fc01616,

drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h

+1 −0
Original line number Diff line number Diff line
@@ -855,6 +855,7 @@ struct rtl8xxxu_fileops { 
	int writeN_block_size;

	u16 mbox_ext_reg;

	char mbox_ext_width;

	char has_s0s1;

	u32 adda_1t_init;

	u32 adda_1t_path_on;

	u32 adda_2t_path_on_a;