leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: rtl8723au: Eliminate ODM_SetBBReg()

Browse Source 
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jes Sorensen 2015-03-05 14:24:50 -05:00 committed by Greg Kroah-Hartman
parent 2635f19c7a
commit 6725e52d22
3 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/staging/rtl8723au/hal/odm.c
View File

@ -909,13 +909,12 @@ void ODM_RF_Saving23a(struct dm_odm_t *pDM_Odm, u8 bForceInNormal)
if (pDM_PSTable->initialize == 0) {
pDM_PSTable->Reg874 =
(rtl8723au_read32(adapter, 0x874) & 0x1CC000) >> 14;
rtl8723au_read32(adapter, 0x874) & 0x1CC000;
pDM_PSTable->RegC70 =
(rtl8723au_read32(adapter, 0xc70) & BIT(3)) >>3;
rtl8723au_read32(adapter, 0xc70) & BIT(3);
pDM_PSTable->Reg85C =
(rtl8723au_read32(adapter, 0x85c) & 0xFF000000) >> 24;
pDM_PSTable->RegA74 =
(rtl8723au_read32(adapter, 0xa74) & 0xF000) >> 12;
rtl8723au_read32(adapter, 0x85c) & 0xFF000000;
pDM_PSTable->RegA74 = rtl8723au_read32(adapter, 0xa74) & 0xF000;
pDM_PSTable->initialize = 1;
}
@ -983,14 +982,22 @@ void ODM_RF_Saving23a(struct dm_odm_t *pDM_Odm, u8 bForceInNormal)
val32 |= BIT(28);
rtl8723au_write32(adapter, 0x818, val32);
} else {
ODM_SetBBReg(pDM_Odm, 0x874, 0x1CC000,
pDM_PSTable->Reg874);
ODM_SetBBReg(pDM_Odm, 0xc70, BIT(3),
pDM_PSTable->RegC70);
ODM_SetBBReg(pDM_Odm, 0x85c, 0xFF000000,
pDM_PSTable->Reg85C);
ODM_SetBBReg(pDM_Odm, 0xa74, 0xF000,
pDM_PSTable->RegA74);
val32 = rtl8723au_read32(adapter, 0x874);
val32 |= pDM_PSTable->Reg874;
rtl8723au_write32(adapter, 0x874, val32);
val32 = rtl8723au_read32(adapter, 0xc70);
val32 |= pDM_PSTable->RegC70;
rtl8723au_write32(adapter, 0xc70, val32);
val32 = rtl8723au_read32(adapter, 0x85c);
val32 |= pDM_PSTable->Reg85C;
rtl8723au_write32(adapter, 0x85c, val32);
val32 = rtl8723au_read32(adapter, 0xa74);
val32 |= pDM_PSTable->RegA74;
rtl8723au_write32(adapter, 0xa74, val32);
val32 = rtl8723au_read32(adapter, 0x818);
val32 &= ~BIT(28);
rtl8723au_write32(adapter, 0x818, val32);

12
drivers/staging/rtl8723au/hal/odm_interface.c
View File

@ -23,18 +23,6 @@
/* */
#include <usb_ops_linux.h>
void ODM_SetBBReg(
struct dm_odm_t *pDM_Odm,
u32 RegAddr,
u32 BitMask,
u32 Data
)
{
struct rtw_adapter *Adapter = pDM_Odm->Adapter;
PHY_SetBBReg(Adapter, RegAddr, BitMask, Data);
}
void ODM_SetRFReg(
struct dm_odm_t *pDM_Odm,
enum RF_RADIO_PATH eRFPath,

1
drivers/staging/rtl8723au/include/odm_interface.h
View File

@ -54,7 +54,6 @@ typedef void (*RT_WORKITEM_CALL_BACK)(struct work_struct *pContext);
/* =========== EXtern Function Prototype */
/* */
void ODM_SetBBReg(struct dm_odm_t *pDM_Odm, u32 RegAddr, u32 BitMask, u32 Data);
void ODM_SetRFReg(struct dm_odm_t *pDM_Odm, enum RF_RADIO_PATH eRFPath,
u32 RegAddr, u32 BitMask, u32 Data);
u32 ODM_GetRFReg(struct dm_odm_t *pDM_Odm, enum RF_RADIO_PATH eRFPath,