rtl8822bu: Integrate rtl8822bu driver

1. Update Tegra platform support in driver makefile
2. Changes in Makefile to use right source path
3. Include driver in net/wireless/drivers Kconfig,
   Makefile

Bug 3098014

Change-Id: Ibc29f16d7be306e410869ed3442da97c40e008ae
Signed-off-by: Shobek Attupurath <sattupurath@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvidia/+/2364555
Reviewed-by: automaticguardword <automaticguardword@nvidia.com>
Reviewed-by: Gaurav Asati <gasati@nvidia.com>
Reviewed-by: Srinivas Ramachandran <srinivasra@nvidia.com>
Reviewed-by: Ashutosh Jha <ajha@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
GVS: Gerrit_Virtual_Submit

6 files changed, 31 insertions, 11 deletions

diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index e26c19de3..1a0f2f620 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -4,4 +4,5 @@ source "drivers/net/wireless/realtek/rtl8812au/Kconfig"
 source "drivers/net/wireless/realtek/rtl8814au/Kconfig"
 source "drivers/net/wireless/realtek/rtl8821au/Kconfig"
 source "drivers/net/wireless/realtek/rtl8821cu/Kconfig"
+source "drivers/net/wireless/realtek/rtl8822bu/Kconfig"
 source "drivers/net/wireless/realtek/rtl8822ce/Kconfig"
diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
index 4a6aa455e..e19a0949b 100644
--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
@@ -4,4 +4,5 @@ obj-$(CONFIG_RTL8812AU) += realtek/rtl8812au/
 obj-$(CONFIG_RTL8814AU) += realtek/rtl8814au/
 obj-$(CONFIG_RTL8821AU) += realtek/rtl8821au/
 obj-$(CONFIG_RTL8821CU) += realtek/rtl8821cu/
+obj-$(CONFIG_RTL8822BU) += realtek/rtl8822bu/
 obj-$(CONFIG_RTL8822CE) += realtek/rtl8822ce/
diff --git a/drivers/net/wireless/realtek/rtl8822bu/Kconfig b/drivers/net/wireless/realtek/rtl8822bu/Kconfig
index 548d63aa6..dc40b8516 100644
--- a/drivers/net/wireless/realtek/rtl8822bu/Kconfig
+++ b/drivers/net/wireless/realtek/rtl8822bu/Kconfig
@@ -1,6 +1,10 @@
 config RTL8822BU
         tristate "Realtek 8822B USB WiFi"
         depends on USB
+        default n
         ---help---
-          Help message of RTL8822BU
+         This module adds support for USB wifi dongles based on Realtek
+         RTL8822BU wireless chipset
 
+         This driver module will be called rtl8822bu
+         Use m if unsure.
diff --git a/drivers/net/wireless/realtek/rtl8822bu/Makefile b/drivers/net/wireless/realtek/rtl8822bu/Makefile
index 0df1fe30e..6c0b5f065 100644
--- a/drivers/net/wireless/realtek/rtl8822bu/Makefile
+++ b/drivers/net/wireless/realtek/rtl8822bu/Makefile
@@ -20,7 +20,8 @@ ifeq ($(GCC_VER_49),1)
 EXTRA_CFLAGS += -Wno-date-time  # Fix compile error && warning on gcc 4.9 and later
 endif
 
-EXTRA_CFLAGS += -I$(src)/include
+SOURCETREE = $(srctree.nvidia)/drivers/net/wireless/realtek/rtl8822bu
+EXTRA_CFLAGS += -I$(SOURCETREE)/include
 
 EXTRA_LDFLAGS += --strip-debug
 
@@ -121,7 +122,8 @@ CONFIG_RTW_SDIO_PM_KEEP_POWER = y
 ###################### MP HW TX MODE FOR VHT #######################
 CONFIG_MP_VHT_HW_TX_MODE = n
 ###################### Platform Related #######################
-CONFIG_PLATFORM_I386_PC = y
+CONFIG_PLATFORM_TEGRA = y
+CONFIG_PLATFORM_I386_PC = n
 CONFIG_PLATFORM_ANDROID_X86 = n
 CONFIG_PLATFORM_ANDROID_INTEL_X86 = n
 CONFIG_PLATFORM_JB_X86 = n
@@ -253,10 +255,10 @@ _HAL_INTFS_FILES :=	hal/hal_intf.o \
                         hal/led/hal_$(HCI_NAME)_led.o
 
 
-EXTRA_CFLAGS += -I$(src)/platform
+EXTRA_CFLAGS += -I$(SOURCETREE)/platform
 _PLATFORM_FILES := platform/platform_ops.o
 
-EXTRA_CFLAGS += -I$(src)/hal/btc
+EXTRA_CFLAGS += -I$(SOURCETREE)/hal/btc
 
 ########### HAL_RTL8188E #################################
 ifeq ($(CONFIG_RTL8188E), y)
@@ -1307,6 +1309,18 @@ INSTALL_PREFIX :=
 STAGINGMODDIR := /lib/modules/$(KVER)/kernel/drivers/staging
 endif
 
+ifeq ($(CONFIG_PLATFORM_TEGRA), y)
+ARCH = arm
+KVER := $(shell uname -r)
+KSRC := /lib/modules/$(KVER)/build
+EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
+EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
+EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE
+EXTRA_CFLAGS += -DRTW_P2P_GROUP_INTERFACE=1
+EXTRA_CFLAGS += -Wno-error=date-time
+MODULE_NAME = rtl8822bu
+endif
+
 ifeq ($(CONFIG_PLATFORM_NV_TK1), y)
 EXTRA_CFLAGS += -DCONFIG_PLATFORM_NV_TK1
 EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
@@ -2281,11 +2295,11 @@ endif
 ifneq ($(KERNELRELEASE),)
 
 ########### this part for *.mk ############################
-include $(src)/hal/phydm/phydm.mk
+include $(SOURCETREE)/hal/phydm/phydm.mk
 
 ########### HAL_RTL8822B #################################
 ifeq ($(CONFIG_RTL8822B), y)
-include $(src)/rtl8822b.mk
+include $(SOURCETREE)/rtl8822b.mk
 endif
 
 ########### HAL_RTL8821C #################################
diff --git a/drivers/net/wireless/realtek/rtl8822bu/hal/phydm/phydm.mk b/drivers/net/wireless/realtek/rtl8822bu/hal/phydm/phydm.mk
index 686350c58..a8cfdc330 100644
--- a/drivers/net/wireless/realtek/rtl8822bu/hal/phydm/phydm.mk
+++ b/drivers/net/wireless/realtek/rtl8822bu/hal/phydm/phydm.mk
@@ -1,4 +1,4 @@
-EXTRA_CFLAGS += -I$(src)/hal/phydm
+EXTRA_CFLAGS += -I$(SOURCETREE)/hal/phydm
 
 _PHYDM_FILES := hal/phydm/phydm_debug.o \
                                                                 hal/phydm/phydm_antdiv.o\
@@ -228,4 +228,4 @@ _PHYDM_FILES += hal/phydm/$(RTL871X)/halhwimg8814b_bb.o\
                                                                 hal/phydm/halrf/$(RTL871X)/halrf_iqk_8814b.o \
                                                                 hal/phydm/halrf/$(RTL871X)/halrf_dpk_8814b.o\
                                                                 hal/phydm/halrf/$(RTL871X)/halrf_rfk_init_8814b.o
-endif
\ No newline at end of file
+endif
diff --git a/drivers/net/wireless/realtek/rtl8822bu/rtl8822b.mk b/drivers/net/wireless/realtek/rtl8822bu/rtl8822b.mk
index 47efae16e..0bbcdcf16 100644
--- a/drivers/net/wireless/realtek/rtl8822bu/rtl8822b.mk
+++ b/drivers/net/wireless/realtek/rtl8822bu/rtl8822b.mk
@@ -47,10 +47,10 @@ _HAL_INTFS_FILES +=	hal/rtl8822b/$(HCI_NAME)/rtl8822bs_halinit.o \
 _HAL_INTFS_FILES +=hal/efuse/rtl8822b/HalEfuseMask8822B_SDIO.o
 endif
 
-include $(src)/halmac.mk
+include $(SOURCETREE)/halmac.mk
 
 _BTC_FILES += hal/btc/halbtc8822bwifionly.o
 ifeq ($(CONFIG_BT_COEXIST), y)
 _BTC_FILES += hal/btc/halbtc8822b1ant.o \
                                 hal/btc/halbtc8822b2ant.o
-endif
\ No newline at end of file
+endif