mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-10 06:49:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

staging: rtl8723au: The RF on an 8723au is always a 6052

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-02-27 15:45:33 -05:00
committed by Greg Kroah-Hartman
parent 277c722cd6
commit 929e570ae2
4 changed files with 1 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c
View File

@@ -920,10 +920,6 @@ _PHY_SetBWMode23a92C(struct rtw_adapter *Adapter)
u8 regBwOpMode;
u8 regRRSR_RSC;
/* There is no 40MHz mode in RF_8225. */
if (pHalData->rf_chip == RF_8225)
return;
if (Adapter->bDriverStopped)
return;
@@ -997,35 +993,7 @@ _PHY_SetBWMode23a92C(struct rtw_adapter *Adapter)
/* RT_TRACE(COMP_SCAN, DBG_LOUD, ("SetBWMode23aCallback8190Pci: time
of SetBWMode23a = %I64d us!\n", (EndTime - BeginTime))); */
/* 3<3>Set RF related register */
switch (pHalData->rf_chip) {
case RF_8225:
/* PHY_SetRF8225Bandwidth(Adapter,
pHalData->CurrentChannelBW); */
break;
case RF_8256:
/* Please implement this function in Hal8190PciPhy8256.c */
/* PHY_SetRF8256Bandwidth(Adapter,
pHalData->CurrentChannelBW); */
break;
case RF_8258:
/* Please implement this function in Hal8190PciPhy8258.c */
/* PHY_SetRF8258Bandwidth(); */
break;
case RF_6052:
rtl8723a_phy_rf6052set_bw(Adapter, pHalData->CurrentChannelBW);
break;
default:
/* RT_ASSERT(false, ("Unknown RFChipID: %d\n",
pHalData->RFChipID)); */
break;
}
/* pHalData->SetBWMode23aInProgress = false; */
rtl8723a_phy_rf6052set_bw(Adapter, pHalData->CurrentChannelBW);
/* RT_TRACE(COMP_SCAN, DBG_LOUD,
("<== PHY_SetBWMode23aCallback8192C() \n")); */

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

@@ -448,7 +448,6 @@ static void _InitRFType(struct rtw_adapter *Adapter)
{
struct hal_data_8723a *pHalData = GET_HAL_DATA(Adapter);
pHalData->rf_chip = RF_6052;
pHalData->rf_type = RF_1T1R;
}
@@ -1088,13 +1087,6 @@ static void _ReadPROMContent(struct rtw_adapter *Adapter)
readAdapterInfo(Adapter);
}
static void _ReadRFType(struct rtw_adapter *Adapter)
{
struct hal_data_8723a *pHalData = GET_HAL_DATA(Adapter);
pHalData->rf_chip = RF_6052;
}
/* */
/* Description: */
/* We should set Efuse cell selection to WiFi cell in default. */
@@ -1124,12 +1116,8 @@ void rtl8723a_read_adapter_info(struct rtw_adapter *Adapter)
hal_EfuseCellSel(Adapter);
_ReadRFType(Adapter);/* rf_chip -> _InitRFType() */
_ReadPROMContent(Adapter);
/* MSG_8723A("%s()(done), rf_chip = 0x%x, rf_type = 0x%x\n",
__func__, pHalData->rf_chip, pHalData->rf_type); */
MSG_8723A("<==== _ReadAdapterInfo8723AU in %d ms\n",
jiffies_to_msecs(jiffies - start));
}

9
drivers/staging/rtl8723au/include/Hal8723APhyCfg.h
View File

@@ -39,15 +39,6 @@ enum WIRELESS_MODE {
WIRELESS_MODE_AC = BIT(6)
};
/* BB/RF related */
enum rf_type_8190p {
RF_TYPE_MIN, /* 0 */
RF_8225 = 1, /* 1 11b/g RF for verification only */
RF_8256 = 2, /* 2 11b/g/n */
RF_8258 = 3, /* 3 11a/b/g/n RF */
RF_6052 = 4, /* 4 11b/g/n RF */
};
struct bb_reg_define {
u32 rfintfs; /* set software control: */
/* 0x870~0x877[8 bytes] */

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

@@ -270,7 +270,6 @@ struct hal_data_8723a {
u16 BasicRateSet;
/* rf_ctrl */
u8 rf_chip;
u8 rf_type;
u8 NumTotalRFPath;