Commit 539b61bf authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723au: odm_ConfigBB_AGC_8723A() always does 32 bit writes 



Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a39bd1f5

drivers/staging/rtl8723au/hal/HalHWImg8723A_BB.c

+2 −3
Original line number Diff line number Diff line
@@ -215,7 +215,6 @@ static u32 Array_AGC_TAB_1T_8723A[] = { 


void ODM_ReadAndConfig_AGC_TAB_1T_8723A(struct dm_odm_t *pDM_Odm)

{



	u32 hex;

	u32 i;

	u8 platform = 0x04;
@@ -233,7 +232,7 @@ void ODM_ReadAndConfig_AGC_TAB_1T_8723A(struct dm_odm_t *pDM_Odm) 


		/*  This (offset, data) pair meets the condition. */

		if (v1 < 0xCDCDCDCD) {

			odm_ConfigBB_AGC_8723A(pDM_Odm, v1, bMaskDWord, v2);

			odm_ConfigBB_AGC_8723A(pDM_Odm, v1, v2);

			continue;

		} else {

			if (!CheckCondition(Array[i], hex)) {
@@ -250,7 +249,7 @@ void ODM_ReadAndConfig_AGC_TAB_1T_8723A(struct dm_odm_t *pDM_Odm) 
				while (v2 != 0xDEAD &&

				       v2 != 0xCDEF &&

				       v2 != 0xCDCD && i < ArrayLen - 2) {

					odm_ConfigBB_AGC_8723A(pDM_Odm, v1, bMaskDWord, v2);

					odm_ConfigBB_AGC_8723A(pDM_Odm, v1, v2);

					READ_NEXT_PAIR(v1, v2, i);

				}

				while (v2 != 0xDEAD && i < ArrayLen - 2)

drivers/staging/rtl8723au/hal/odm_RegConfig8723A.c

+4 −10
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
 ******************************************************************************/



#include "odm_precomp.h"

#include "usb_ops_linux.h"



void

odm_ConfigRFReg_8723A(
@@ -54,21 +55,14 @@ void odm_ConfigMAC_8723A(struct dm_odm_t *pDM_Odm, 
		     Addr, Data));

}



void

odm_ConfigBB_AGC_8723A(

	struct dm_odm_t *pDM_Odm,

	u32		Addr,

	u32		Bitmask,

	u32		Data

  )

void odm_ConfigBB_AGC_8723A(struct dm_odm_t *pDM_Odm, u32 addr, u32 data)

{

	ODM_SetBBReg(pDM_Odm, Addr, Bitmask, Data);

	rtl8723au_write32(pDM_Odm->Adapter, addr, data);

	/*  Add 1us delay between BB/RF register setting. */

	udelay(1);



	ODM_RT_TRACE(pDM_Odm, ODM_COMP_INIT, ODM_DBG_LOUD,

		     ("===> ODM_ConfigBBWithHeaderFile23a: [AGC_TAB] %08X %08X\n",

		     Addr, Data));

		     ("===> %s: [AGC_TAB] %08X %08X\n", __func__, addr, data));

}



void

drivers/staging/rtl8723au/include/odm_RegConfig8723A.h

+1 −2
Original line number Diff line number Diff line
@@ -20,8 +20,7 @@ void odm_ConfigRFReg_8723A(struct dm_odm_t *pDM_Odm, u32 Addr, u32 Data, 


void odm_ConfigMAC_8723A(struct dm_odm_t *pDM_Odm, u32 Addr, u8 Data);



void odm_ConfigBB_AGC_8723A(struct dm_odm_t *pDM_Odm, u32 Addr,

			    u32 Bitmask, u32 Data);

void odm_ConfigBB_AGC_8723A(struct dm_odm_t *pDM_Odm, u32 addr, u32 data);



void odm_ConfigBB_PHY_8723A(struct dm_odm_t *pDM_Odm, u32 Addr, u32 Bitmask, u32 Data);