staging: rtl8723au: Remove rf type from struct hal_version (277c722c) · Commits · jan.koester / Linux

drivers/staging/rtl8723au/hal/HalDMOutSrc8723A_CE.c

+8 −11

Original line number	Original line	Diff line number	Diff line
	@@ -978,12 +978,10 @@ void rtl8723a_phy_iq_calibrate(struct rtw_adapter *pAdapter, bool bReCovery)
	is13simular = false;		is13simular = false;

	for (i = 0; i < 3; i++) {		for (i = 0; i < 3; i++) {
	if (IS_92C_SERIAL(pHalData->VersionID)) {		if (pHalData->rf_type == RF_2T2R)
	_PHY_IQCalibrate(pAdapter, result, i, true);		_PHY_IQCalibrate(pAdapter, result, i, true);
	} else {		else /* For 88C 1T1R */
	/* For 88C 1T1R */
	_PHY_IQCalibrate(pAdapter, result, i, false);		_PHY_IQCalibrate(pAdapter, result, i, false);
	}

	if (i == 1) {		if (i == 1) {
	is12simular = _PHY_SimularityCompare(pAdapter, result, 0, 1);		is12simular = _PHY_SimularityCompare(pAdapter, result, 0, 1);
	@@ -1051,9 +1049,10 @@ void rtl8723a_phy_iq_calibrate(struct rtw_adapter *pAdapter, bool bReCovery)
	if ((RegE94 != 0)/&&(RegEA4 != 0)/)		if ((RegE94 != 0)/&&(RegEA4 != 0)/)
	_PHY_PathAFillIQKMatrix(pAdapter, bPathAOK, result, final_candidate, (RegEA4 == 0));		_PHY_PathAFillIQKMatrix(pAdapter, bPathAOK, result, final_candidate, (RegEA4 == 0));

	if (IS_92C_SERIAL(pHalData->VersionID)) {		if (pHalData->rf_type == RF_2T2R) {
	if ((RegEB4 != 0)/&&(RegEC4 != 0)/)		if ((RegEB4 != 0)/&&(RegEC4 != 0)/)
	_PHY_PathBFillIQKMatrix(pAdapter, bPathBOK, result, final_candidate, (RegEC4 == 0));		_PHY_PathBFillIQKMatrix(pAdapter, bPathBOK, result,
			final_candidate, (RegEC4 == 0));
	}		}

	_PHY_SaveADDARegisters(pAdapter, IQK_BB_REG_92C, pdmpriv->IQK_BB_backup_recover, 9);		_PHY_SaveADDARegisters(pAdapter, IQK_BB_REG_92C, pdmpriv->IQK_BB_backup_recover, 9);
	@@ -1072,13 +1071,11 @@ void rtl8723a_phy_lc_calibrate(struct rtw_adapter *pAdapter)
	if (pmlmeext->sitesurvey_res.state == SCAN_PROCESS)		if (pmlmeext->sitesurvey_res.state == SCAN_PROCESS)
	return;		return;

	if (IS_92C_SERIAL(pHalData->VersionID)) {		if (pHalData->rf_type == RF_2T2R)
	_PHY_LCCalibrate(pAdapter, true);		_PHY_LCCalibrate(pAdapter, true);
	} else {		else /* For 88C 1T1R */
	/* For 88C 1T1R */
	_PHY_LCCalibrate(pAdapter, false);		_PHY_LCCalibrate(pAdapter, false);
	}		}
	}

	void		void
	rtl8723a_phy_ap_calibrate(struct rtw_adapter *pAdapter, char delta)		rtl8723a_phy_ap_calibrate(struct rtw_adapter *pAdapter, char delta)

drivers/staging/rtl8723au/hal/hal_com.c

+0 −40

Original line number	Original line	Diff line number	Diff line
	@@ -22,46 +22,6 @@

	#define _HAL_INIT_C_		#define _HAL_INIT_C_

	void dump_chip_info23a(struct hal_version ChipVersion)
	{
	int cnt = 0;
	u8 buf[128];

	cnt += sprintf((buf + cnt), "Chip Version Info: CHIP_8723A_");

	cnt += sprintf((buf + cnt), "%s_", IS_NORMAL_CHIP(ChipVersion) ?
	"Normal_Chip" : "Test_Chip");
	cnt += sprintf((buf + cnt), "%s_",
	IS_CHIP_VENDOR_TSMC(ChipVersion) ? "TSMC" : "UMC");
	if (IS_A_CUT(ChipVersion))
	cnt += sprintf((buf + cnt), "A_CUT_");
	else if (IS_B_CUT(ChipVersion))
	cnt += sprintf((buf + cnt), "B_CUT_");
	else if (IS_C_CUT(ChipVersion))
	cnt += sprintf((buf + cnt), "C_CUT_");
	else if (IS_D_CUT(ChipVersion))
	cnt += sprintf((buf + cnt), "D_CUT_");
	else if (IS_E_CUT(ChipVersion))
	cnt += sprintf((buf + cnt), "E_CUT_");
	else
	cnt += sprintf((buf + cnt), "UNKNOWN_CUT(%d)_",
	ChipVersion.CUTVersion);

	if (IS_1T1R(ChipVersion))
	cnt += sprintf((buf + cnt), "1T1R_");
	else if (IS_1T2R(ChipVersion))
	cnt += sprintf((buf + cnt), "1T2R_");
	else if (IS_2T2R(ChipVersion))
	cnt += sprintf((buf + cnt), "2T2R_");
	else
	cnt += sprintf((buf + cnt), "UNKNOWN_RFTYPE(%d)_",
	ChipVersion.RFType);

	cnt += sprintf((buf + cnt), "RomVer(%d)\n", ChipVersion.ROMVer);

	DBG_8723A("%s", buf);
	}

	#define EEPROM_CHANNEL_PLAN_BY_HW_MASK 0x80		#define EEPROM_CHANNEL_PLAN_BY_HW_MASK 0x80

	/* return the final channel plan decision */		/* return the final channel plan decision */

drivers/staging/rtl8723au/hal/rtl8723a_cmd.c

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -169,10 +169,8 @@ void rtl8723a_set_FwPwrMode_cmd(struct rtw_adapter *padapter, u8 Mode)
	prevent conficting setting in Fw power */		prevent conficting setting in Fw power */
	/* saving sequence. 2010.06.07. Added by tynli.		/* saving sequence. 2010.06.07. Added by tynli.
	Suggested by SD3 yschang. */		Suggested by SD3 yschang. */
	if ((Mode != PS_MODE_ACTIVE) &&		if (Mode != PS_MODE_ACTIVE && pHalData->rf_type != RF_2T2R)
	(!IS_92C_SERIAL(pHalData->VersionID))) {
	ODM_RF_Saving23a(&pHalData->odmpriv, true);		ODM_RF_Saving23a(&pHalData->odmpriv, true);
	}

	H2CSetPwrMode.Mode = Mode;		H2CSetPwrMode.Mode = Mode;
	H2CSetPwrMode.SmartPS = pwrpriv->smart_ps;		H2CSetPwrMode.SmartPS = pwrpriv->smart_ps;

drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c

+1 −9

Original line number	Original line	Diff line number	Diff line
	@@ -744,7 +744,7 @@ void rtl8723a_read_chip_version(struct rtw_adapter *padapter)
	value32 = rtl8723au_read32(padapter, REG_SYS_CFG);		value32 = rtl8723au_read32(padapter, REG_SYS_CFG);
	ChipVersion.ICType = CHIP_8723A;		ChipVersion.ICType = CHIP_8723A;
	ChipVersion.ChipType = ((value32 & RTL_ID) ? TEST_CHIP : NORMAL_CHIP);		ChipVersion.ChipType = ((value32 & RTL_ID) ? TEST_CHIP : NORMAL_CHIP);
	ChipVersion.RFType = RF_TYPE_1T1R;		pHalData->rf_type = RF_1T1R;
	ChipVersion.VendorType =		ChipVersion.VendorType =
	((value32 & VENDOR_ID) ? CHIP_VENDOR_UMC : CHIP_VENDOR_TSMC);		((value32 & VENDOR_ID) ? CHIP_VENDOR_UMC : CHIP_VENDOR_TSMC);
	ChipVersion.CUTVersion = (value32 & CHIP_VER_RTL_MASK) >> CHIP_VER_RTL_SHIFT; /* IC version (CUT) */		ChipVersion.CUTVersion = (value32 & CHIP_VER_RTL_MASK) >> CHIP_VER_RTL_SHIFT; /* IC version (CUT) */
	@@ -768,16 +768,8 @@ void rtl8723a_read_chip_version(struct rtw_adapter *padapter)
	pHalData->PolarityCtl =		pHalData->PolarityCtl =
	((value32 & WL_HWPDN_SL) ? RT_POLARITY_HIGH_ACT :		((value32 & WL_HWPDN_SL) ? RT_POLARITY_HIGH_ACT :
	RT_POLARITY_LOW_ACT);		RT_POLARITY_LOW_ACT);
	dump_chip_info23a(ChipVersion);
	pHalData->VersionID = ChipVersion;		pHalData->VersionID = ChipVersion;

	if (IS_1T2R(ChipVersion))
	pHalData->rf_type = RF_1T2R;
	else if (IS_2T2R(ChipVersion))
	pHalData->rf_type = RF_2T2R;
	else
	pHalData->rf_type = RF_1T1R;

	MSG_8723A("RF_Type is %x!!\n", pHalData->rf_type);		MSG_8723A("RF_Type is %x!!\n", pHalData->rf_type);
	}		}

drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -419,7 +419,6 @@ PHY_SetRFReg(struct rtw_adapter *Adapter, enum RF_RADIO_PATH eRFPath,
	int PHY_MACConfig8723A(struct rtw_adapter *Adapter)		int PHY_MACConfig8723A(struct rtw_adapter *Adapter)
	{		{
	struct hal_data_8723a *pHalData = GET_HAL_DATA(Adapter);		struct hal_data_8723a *pHalData = GET_HAL_DATA(Adapter);
	bool is92C = IS_92C_SERIAL(pHalData->VersionID);

	/* */		/* */
	/* Config MAC */		/* Config MAC */
	@@ -429,7 +428,8 @@ int PHY_MACConfig8723A(struct rtw_adapter *Adapter)
	/* 2010.07.13 AMPDU aggregation number 9 */		/* 2010.07.13 AMPDU aggregation number 9 */
	/* rtw_write16(Adapter, REG_MAX_AGGR_NUM, MAX_AGGR_NUM); */		/* rtw_write16(Adapter, REG_MAX_AGGR_NUM, MAX_AGGR_NUM); */
	rtl8723au_write8(Adapter, REG_MAX_AGGR_NUM, 0x0A);		rtl8723au_write8(Adapter, REG_MAX_AGGR_NUM, 0x0A);
	if (is92C && (BOARD_USB_DONGLE == pHalData->BoardType))		if (pHalData->rf_type == RF_2T2R &&
			BOARD_USB_DONGLE == pHalData->BoardType)
	rtl8723au_write8(Adapter, 0x40, 0x04);		rtl8723au_write8(Adapter, 0x40, 0x04);

	return _SUCCESS;		return _SUCCESS;