Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Jes Sorensen and committed by
Greg Kroah-Hartman
539b61bf a39bd1f5

+7 -15
+2 -3
drivers/staging/rtl8723au/hal/HalHWImg8723A_BB.c
··· 215 215 216 216 void ODM_ReadAndConfig_AGC_TAB_1T_8723A(struct dm_odm_t *pDM_Odm) 217 217 { 218 - 219 218 u32 hex; 220 219 u32 i; 221 220 u8 platform = 0x04; ··· 232 233 233 234 /* This (offset, data) pair meets the condition. */ 234 235 if (v1 < 0xCDCDCDCD) { 235 - odm_ConfigBB_AGC_8723A(pDM_Odm, v1, bMaskDWord, v2); 236 + odm_ConfigBB_AGC_8723A(pDM_Odm, v1, v2); 236 237 continue; 237 238 } else { 238 239 if (!CheckCondition(Array[i], hex)) { ··· 249 250 while (v2 != 0xDEAD && 250 251 v2 != 0xCDEF && 251 252 v2 != 0xCDCD && i < ArrayLen - 2) { 252 - odm_ConfigBB_AGC_8723A(pDM_Odm, v1, bMaskDWord, v2); 253 + odm_ConfigBB_AGC_8723A(pDM_Odm, v1, v2); 253 254 READ_NEXT_PAIR(v1, v2, i); 254 255 } 255 256 while (v2 != 0xDEAD && i < ArrayLen - 2)
+4 -10
drivers/staging/rtl8723au/hal/odm_RegConfig8723A.c
··· 14 14 ******************************************************************************/ 15 15 16 16 #include "odm_precomp.h" 17 + #include "usb_ops_linux.h" 17 18 18 19 void 19 20 odm_ConfigRFReg_8723A( ··· 55 54 Addr, Data)); 56 55 } 57 56 58 - void 59 - odm_ConfigBB_AGC_8723A( 60 - struct dm_odm_t *pDM_Odm, 61 - u32 Addr, 62 - u32 Bitmask, 63 - u32 Data 64 - ) 57 + void odm_ConfigBB_AGC_8723A(struct dm_odm_t *pDM_Odm, u32 addr, u32 data) 65 58 { 66 - ODM_SetBBReg(pDM_Odm, Addr, Bitmask, Data); 59 + rtl8723au_write32(pDM_Odm->Adapter, addr, data); 67 60 /* Add 1us delay between BB/RF register setting. */ 68 61 udelay(1); 69 62 70 63 ODM_RT_TRACE(pDM_Odm, ODM_COMP_INIT, ODM_DBG_LOUD, 71 - ("===> ODM_ConfigBBWithHeaderFile23a: [AGC_TAB] %08X %08X\n", 72 - Addr, Data)); 64 + ("===> %s: [AGC_TAB] %08X %08X\n", __func__, addr, data)); 73 65 } 74 66 75 67 void
+1 -2
drivers/staging/rtl8723au/include/odm_RegConfig8723A.h
··· 20 20 21 21 void odm_ConfigMAC_8723A(struct dm_odm_t *pDM_Odm, u32 Addr, u8 Data); 22 22 23 - void odm_ConfigBB_AGC_8723A(struct dm_odm_t *pDM_Odm, u32 Addr, 24 - u32 Bitmask, u32 Data); 23 + void odm_ConfigBB_AGC_8723A(struct dm_odm_t *pDM_Odm, u32 addr, u32 data); 25 24 26 25 void odm_ConfigBB_PHY_8723A(struct dm_odm_t *pDM_Odm, u32 Addr, u32 Bitmask, u32 Data); 27 26