net: wireless: bcm4335: fix Kconfig and Makefile

Fix Kconfig and Makefile to build bcm4335 independently

Bug 1216788

Change-Id: Id52ac1bb2615075b30672536ac01e1d8d347c112
Signed-off-by: Nagarjuna Kristam <nkristam@nvidia.com>
Reviewed-on: http://git-master/r/193396
GVS: Gerrit_Virtual_Submit
Reviewed-by: Om Prakash Singh <omp@nvidia.com>
Tested-by: Om Prakash Singh <omp@nvidia.com>
Reviewed-by: Rakesh Kumar <krakesh@nvidia.com>
Reviewed-by: Bitan Biswas <bbiswas@nvidia.com>

5 files changed, 34 insertions, 31 deletions

diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index c824eb1a4c7b..bf5582cdb3f0 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -272,6 +272,7 @@ config WIFI_CONTROL_FUNC
 source "drivers/net/wireless/ath/Kconfig"
 source "drivers/net/wireless/b43/Kconfig"
 source "drivers/net/wireless/b43legacy/Kconfig"
+source "drivers/net/wireless/bcm4335/Kconfig"
 source "drivers/net/wireless/brcm80211/Kconfig"
 source "drivers/net/wireless/sd8797/Kconfig"
 source "drivers/net/wireless/hostap/Kconfig"
diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
index 8d6ee3d1bc45..2b40697ad030 100644
--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
@@ -55,6 +55,8 @@ obj-$(CONFIG_WL_TI)	+= ti/
 
 obj-$(CONFIG_MWIFIEX)	+= mwifiex/
 
+obj-$(CONFIG_BCM4335)	+= bcm4335/
+
 obj-$(CONFIG_BRCMFMAC)	+= brcm80211/
 obj-$(CONFIG_BRCMSMAC)	+= brcm80211/
 obj-$(CONFIG_SD8797)	+= sd8797/
diff --git a/drivers/net/wireless/bcm4335/Kconfig b/drivers/net/wireless/bcm4335/Kconfig
index feae2bf7f378..61c5b466e6bc 100644
--- a/drivers/net/wireless/bcm4335/Kconfig
+++ b/drivers/net/wireless/bcm4335/Kconfig
@@ -1,4 +1,4 @@
-config BCMDHD
+config BCM4335
 	tristate "Broadcom 4335 wireless cards support"
 	depends on MMC
 	---help---
@@ -10,45 +10,45 @@ config BCMDHD
 	  If you choose to build a module, it'll be called dhd. Say M if
 	  unsure.
 
-config BCMDHD_FW_PATH
-	depends on BCMDHD
+config BCM4335_FW_PATH
+	depends on BCM4335
 	string "Firmware path"
-	default "/system/etc/firmware/fw_bcmdhd.bin"
+	default "/system/etc/firmware/fw_BCM4335.bin"
 	---help---
 	  Path to the firmware file.
 
-config BCMDHD_NVRAM_PATH
-	depends on BCMDHD
+config BCM4335_NVRAM_PATH
+	depends on BCM4335
 	string "NVRAM path"
-	default "/system/etc/wifi/bcmdhd.cal"
+	default "/system/etc/wifi/BCM4335.cal"
 	---help---
 	  Path to the calibration file.
 
 config DHD_USE_STATIC_BUF
 	bool "Enable memory preallocation"
-	depends on BCMDHD
+	depends on BCM4335
 	default n
 	---help---
 	  Use memory preallocated in platform
 
 config DHD_USE_SCHED_SCAN
 	bool "Use CFG80211 sched scan"
-	depends on BCMDHD && CFG80211
+	depends on BCM4335 && CFG80211
 	default y
 	---help---
 	  Use CFG80211 sched scan
 
-config BCMDHD_WIFI_CONTROL_FUNC
-	bool "Use bcmdhd_wlan device"
-	depends on BCMDHD
+config BCM4335_WIFI_CONTROL_FUNC
+	bool "Use BCM4335_wlan device"
+	depends on BCM4335
 	default n
 	---help---
 	  Use this option to get various parameters from architecture specific
-	  bcmdhd_wlan platform device. Say n if unsure.
+	  BCM4335_wlan platform device. Say n if unsure.
 
-config BCMDHD_HW_OOB
+config BCM4335_HW_OOB
 	bool "Use out of band interrupt"
-	depends on BCMDHD
+	depends on BCM4335
 	default n
 	---help---
-	  Use out of band interrupt for card interrupt and wake on wireless.
\ No newline at end of file
+	  Use out of band interrupt for card interrupt and wake on wireless.
diff --git a/drivers/net/wireless/bcm4335/Makefile b/drivers/net/wireless/bcm4335/Makefile
index d93cb5f8be80..3f8d2be7b441 100644
--- a/drivers/net/wireless/bcm4335/Makefile
+++ b/drivers/net/wireless/bcm4335/Makefile
@@ -1,4 +1,4 @@
-# bcmdhd
+# BCM4335
 DHDCFLAGS = -Wall -Wstrict-prototypes -Dlinux -DLINUX -DBCMDRIVER             \
         -DBCMDONGLEHOST -DUNRELEASEDCHIP -DBCMDMA32 -DBCMFILEIMAGE            \
         -DDHDTHREAD -DBDC -DDHD_BCMEVENTS -DSHOW_EVENTS -DBCMDBG              \
@@ -6,7 +6,7 @@ DHDCFLAGS = -Wall -Wstrict-prototypes -Dlinux -DLINUX -DBCMDRIVER             \
         -DWIFI_ACT_FRAME -DARP_OFFLOAD_SUPPORT                                \
         -DKEEP_ALIVE -DCSCAN -DPKT_FILTER_SUPPORT                             \
 	-DEMBEDDED_PLATFORM -DPNO_SUPPORT                                     \
-	-Idrivers/net/wireless/bcmdhd -Idrivers/net/wireless/bcmdhd/include
+	-Idrivers/net/wireless/bcm4335 -Idrivers/net/wireless/bcm4335/include
 
 #DHDCFLAGS += -DDHD_DEBUG -DBCMDBG
 
@@ -44,13 +44,13 @@ ifneq ($(CONFIG_DHD_USE_SCHED_SCAN),)
 DHDCFLAGS += -DWL_SCHED_SCAN
 endif
 
-ifeq ($(CONFIG_BCMDHD_WIFI_CONTROL_FUNC),y)
+ifeq ($(CONFIG_BCM4335_WIFI_CONTROL_FUNC),y)
 DHDCFLAGS += -DCONFIG_WIFI_CONTROL_FUNC
 else
 DHDCFLAGS += -DCUSTOM_OOB_GPIO_NUM=2
 endif
 
-ifeq ($(CONFIG_BCMDHD_HW_OOB),y)
+ifeq ($(CONFIG_BCM4335_HW_OOB),y)
 DHDCFLAGS += -DHW_OOB -DOOB_INTR_ONLY
 else
 DHDCFLAGS += -DSDIO_ISR_THREAD
@@ -62,9 +62,9 @@ DHDOFILES = aiutils.o bcmsdh_sdmmc_linux.o dhd_linux.o siutils.o bcmutils.o   \
 	bcmsdh_sdmmc.o dhd_custom_gpio.o sbutils.o wldev_common.o wl_android.o \
 	wl_cfg80211.o wl_cfgp2p.o wl_linux_mon.o dhd_cfg80211.o
 
-obj-$(CONFIG_BCMDHD) += bcmdhd.o
-bcmdhd-objs += $(DHDOFILES)
+obj-$(CONFIG_BCM4335) += bcm4335.o
+bcm4335-objs += $(DHDOFILES)
 EXTRA_CFLAGS = $(DHDCFLAGS)
-ifeq ($(CONFIG_BCMDHD),m)
+ifeq ($(CONFIG_BCM4335),m)
 EXTRA_LDFLAGS += --strip-debug
 endif
diff --git a/drivers/net/wireless/bcm4335/dhd_common.c b/drivers/net/wireless/bcm4335/dhd_common.c
index 72ef190bdc1f..35a55863fec6 100644
--- a/drivers/net/wireless/bcm4335/dhd_common.c
+++ b/drivers/net/wireless/bcm4335/dhd_common.c
@@ -187,16 +187,16 @@ const bcm_iovar_t dhd_iovars[] = {
 void
 dhd_common_init(osl_t *osh)
 {
-#ifdef CONFIG_BCMDHD_FW_PATH
-	bcm_strncpy_s(fw_path, sizeof(fw_path), CONFIG_BCMDHD_FW_PATH, MOD_PARAM_PATHLEN-1);
-#else /* CONFIG_BCMDHD_FW_PATH */
+#ifdef CONFIG_BCM4335_FW_PATH
+	bcm_strncpy_s(fw_path, sizeof(fw_path), CONFIG_BCM4335_FW_PATH, MOD_PARAM_PATHLEN-1);
+#else /* CONFIG_BCM4335_FW_PATH */
 	fw_path[0] = '\0';
-#endif /* CONFIG_BCMDHD_FW_PATH */
-#ifdef CONFIG_BCMDHD_NVRAM_PATH
-	bcm_strncpy_s(nv_path, sizeof(nv_path), CONFIG_BCMDHD_NVRAM_PATH, MOD_PARAM_PATHLEN-1);
-#else /* CONFIG_BCMDHD_NVRAM_PATH */
+#endif /* CONFIG_BCM4335_FW_PATH */
+#ifdef CONFIG_BCM4335_NVRAM_PATH
+	bcm_strncpy_s(nv_path, sizeof(nv_path), CONFIG_BCM4335_NVRAM_PATH, MOD_PARAM_PATHLEN-1);
+#else /* CONFIG_BCM4335_NVRAM_PATH */
 	nv_path[0] = '\0';
-#endif /* CONFIG_BCMDHD_NVRAM_PATH */
+#endif /* CONFIG_BCM4335_NVRAM_PATH */
 #ifdef SOFTAP
 	fw_path2[0] = '\0';
 #endif