Commit adba838a authored by Guo-Feng Fan's avatar Guo-Feng Fan Committed by Kalle Valo
Browse files

rtw88: coex: 8821c: correct antenna switch function 



This patch fixes a defect that uses incorrect function to access
registers. Use 8 and 32 bit access function to access 8 and 32 bit long
data respectively.

Signed-off-by: default avatarGuo-Feng Fan <vincent_fann@realtek.com>
Signed-off-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20210202055012.8296-2-pkshih@realtek.com
parent 711fa16f

drivers/net/wireless/realtek/rtw88/rtw8821c.c

+8 −8
Original line number Diff line number Diff line
@@ -719,7 +719,7 @@ static void rtw8821c_coex_cfg_ant_switch(struct rtw_dev *rtwdev, u8 ctrl_type, 
			regval = (!polarity_inverse ? 0x1 : 0x2);

		}



		rtw_write8_mask(rtwdev, REG_RFE_CTRL8, BIT_MASK_R_RFE_SEL_15,

		rtw_write32_mask(rtwdev, REG_RFE_CTRL8, BIT_MASK_R_RFE_SEL_15,

				 regval);

		break;

	case COEX_SWITCH_CTRL_BY_PTA:
@@ -730,7 +730,7 @@ static void rtw8821c_coex_cfg_ant_switch(struct rtw_dev *rtwdev, u8 ctrl_type, 
				PTA_CTRL_PIN);



		regval = (!polarity_inverse ? 0x2 : 0x1);

		rtw_write8_mask(rtwdev, REG_RFE_CTRL8, BIT_MASK_R_RFE_SEL_15,

		rtw_write32_mask(rtwdev, REG_RFE_CTRL8, BIT_MASK_R_RFE_SEL_15,

				 regval);

		break;

	case COEX_SWITCH_CTRL_BY_ANTDIV:
@@ -757,11 +757,11 @@ static void rtw8821c_coex_cfg_ant_switch(struct rtw_dev *rtwdev, u8 ctrl_type, 
	}



	if (ctrl_type == COEX_SWITCH_CTRL_BY_BT) {

		rtw_write32_clr(rtwdev, REG_CTRL_TYPE, BIT_CTRL_TYPE1);

		rtw_write32_clr(rtwdev, REG_CTRL_TYPE, BIT_CTRL_TYPE2);

		rtw_write8_clr(rtwdev, REG_CTRL_TYPE, BIT_CTRL_TYPE1);

		rtw_write8_clr(rtwdev, REG_CTRL_TYPE, BIT_CTRL_TYPE2);

	} else {

		rtw_write32_set(rtwdev, REG_CTRL_TYPE, BIT_CTRL_TYPE1);

		rtw_write32_set(rtwdev, REG_CTRL_TYPE, BIT_CTRL_TYPE2);

		rtw_write8_set(rtwdev, REG_CTRL_TYPE, BIT_CTRL_TYPE1);

		rtw_write8_set(rtwdev, REG_CTRL_TYPE, BIT_CTRL_TYPE2);

	}

}