Skip to content

Commit e2bdc19

Browse files
committed
revert modification of rtl8723bs
Change-Id: I930044ad4cda194a4fc73b6b5c033b4de135cc80 Reviewed-on: https://tp-biosrd-v02/gerrit/81572 Reviewed-by: Scorpio Chang(張志賢) <Scorpio_Chang@asus.com> Tested-by: Scorpio Chang(張志賢) <Scorpio_Chang@asus.com>
1 parent e3c3c69 commit e2bdc19

233 files changed

Lines changed: 147071 additions & 147227 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

drivers/net/wireless/rockchip_wlan/rtl8723bs/Makefile

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ EXTRA_CFLAGS += -I$(src)/include
2020
EXTRA_CFLAGS += -I$(src)/hal/phydm
2121

2222
EXTRA_LDFLAGS += --strip-debug
23-
CONFIG_ANDROID_4_2 = n
24-
CONFIG_ANDROID_4_4_Kernel_3_0 = n
2523

2624
CONFIG_AUTOCFG_CP = n
2725

@@ -77,7 +75,7 @@ CONFIG_RTW_SDIO_PM_KEEP_POWER = y
7775
###################### MP HW TX MODE FOR VHT #######################
7876
CONFIG_MP_VHT_HW_TX_MODE = n
7977
###################### Platform Related #######################
80-
CONFIG_PLATFORM_I386_PC = n
78+
CONFIG_PLATFORM_I386_PC = y
8179
CONFIG_PLATFORM_ANDROID_X86 = n
8280
CONFIG_PLATFORM_ANDROID_INTEL_X86 = n
8381
CONFIG_PLATFORM_JB_X86 = n
@@ -102,7 +100,7 @@ CONFIG_PLATFORM_ARM_TCC8920_JB42 = n
102100
CONFIG_PLATFORM_ARM_TCC8930_JB42 = n
103101
CONFIG_PLATFORM_ARM_RK2818 = n
104102
CONFIG_PLATFORM_ARM_RK3066 = n
105-
CONFIG_PLATFORM_ARM_RK3188 = y
103+
CONFIG_PLATFORM_ARM_RK3188 = n
106104
CONFIG_PLATFORM_ARM_URBETTER = n
107105
CONFIG_PLATFORM_ARM_TI_PANDA = n
108106
CONFIG_PLATFORM_MIPS_JZ4760 = n
@@ -1248,21 +1246,12 @@ EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
12481246
EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE
12491247
# default setting for Power control
12501248
EXTRA_CFLAGS += -DRTW_ENABLE_WIFI_CONTROL_FUNC
1251-
#EXTRA_CFLAGS += -DRTW_SUPPORT_PLATFORM_SHUTDOWN
1249+
EXTRA_CFLAGS += -DRTW_SUPPORT_PLATFORM_SHUTDOWN
12521250
# default setting for Special function
1253-
EXTRA_CFLAGS += -DCONFIG_P2P_IPS
1254-
ifeq ($(CONFIG_ANDROID_4_2), y)
1255-
EXTRA_CFLAGS += -DCONFIG_ANDROID_4_2
1256-
else
1257-
ifeq ($(CONFIG_ANDROID_4_4_Kernel_3_0), y)
1258-
else
1259-
EXTRA_CFLAGS += -DCONFIG_RADIO_WORK
1260-
endif
1261-
endif
12621251
ARCH := arm
12631252
CROSS_COMPILE := /home/android_sdk/Rockchip/Rk3188/prebuilts/gcc/linux-x86/arm/arm-eabi-4.6/bin/arm-eabi-
12641253
KSRC := /home/android_sdk/Rockchip/Rk3188/kernel
1265-
MODULE_NAME := 8723bs
1254+
MODULE_NAME := wlan
12661255
endif
12671256

12681257
ifeq ($(CONFIG_PLATFORM_ARM_RK3066), y)

drivers/net/wireless/rockchip_wlan/rtl8723bs/clean

100644100755
File mode changed.

drivers/net/wireless/rockchip_wlan/rtl8723bs/core/efuse/rtw_efuse.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,6 @@ efuse_OneByteWrite(
512512
return bResult;
513513
}
514514

515-
Efuse_PowerSwitch(pAdapter, _TRUE, _TRUE);
516515

517516
// -----------------e-fuse reg ctrl ---------------------------------
518517
//address
@@ -564,8 +563,6 @@ efuse_OneByteWrite(
564563
PHY_SetMacReg(pAdapter, EFUSE_TEST, BIT(11), 0);
565564
}
566565

567-
Efuse_PowerSwitch(pAdapter, _TRUE, _FALSE);
568-
569566
return bResult;
570567
}
571568

@@ -1004,7 +1001,7 @@ u8 rtw_efuse_map_write(PADAPTER padapter, u16 addr, u16 cnts, u8 *data)
10041001
DBG_8192C("%s , data[%d] = %x, map[addr+i]= %x\n", __func__, i, data[i], map[addr+i]);
10051002
}
10061003
}
1007-
/*Efuse_PowerSwitch(padapter, _TRUE, _TRUE);*/
1004+
Efuse_PowerSwitch(padapter, _TRUE, _TRUE);
10081005

10091006
idx = 0;
10101007
offset = (addr >> 3);
@@ -1050,7 +1047,7 @@ u8 rtw_efuse_map_write(PADAPTER padapter, u16 addr, u16 cnts, u8 *data)
10501047
offset++;
10511048
}
10521049

1053-
/*Efuse_PowerSwitch(padapter, _TRUE, _FALSE);*/
1050+
Efuse_PowerSwitch(padapter, _TRUE, _FALSE);
10541051

10551052
exit:
10561053

0 commit comments

Comments
 (0)