net: wireless: use CONFIG_BCMDHD_HW_OOB to enable HW_OOB and OOB_INTR_ONLY

Enable HW_OOB and OOB_INTR_ONLY when CONFIG_BCMDHD_HW_OOB is set,
else enable SDIO_ISR_THREAD

bug 200001046

Change-Id: Icd72c7ffe8bdcfe5b7b15139153ec117c86f2569
Signed-off-by: Seshagir.H <sholi@nvidia.com>
Reviewed-on: http://git-master/r/403380
Reviewed-by: Venu Byravarasu <vbyravarasu@nvidia.com>
(cherry picked from commit c8fd6f8c298dc8a2f6045df6220d0c0838b0a6b9)
Reviewed-on: http://git-master/r/404240
Reviewed-by: Phoenix Jung <pjung@nvidia.com>
Reviewed-by: Sandeep Trasi <strasi@nvidia.com>
Reviewed-by: Bitan Biswas <bbiswas@nvidia.com>

diff --git a/drivers/net/wireless/bcm43241/Makefile b/drivers/net/wireless/bcm43241/Makefile
index 3e15b764d67239daddf41b005c72d5c6fc7c0016..5755e34927bfceaec0af14a4f5a3a97e57ad5596 100644 (file)
--- a/drivers/net/wireless/bcm43241/Makefile
+++ b/drivers/net/wireless/bcm43241/Makefile
@@ -94,7 +94,7 @@ DHDCFLAGS += -DWL_ENABLE_P2P_IF
 ##########################
 DRIVER_TYPE ?= $(CONFIG_BCMDHD)
 
-DHDCFLAGS += -DBCM4339_CHIP -DBCM43241_CHIP -DBCM4354_CHIP -DHW_OOB
+DHDCFLAGS += -DBCM4339_CHIP -DBCM43241_CHIP -DBCM4354_CHIP
 DHDCFLAGS += -DPROP_TXSTATUS_VSDB
 DHDCFLAGS += -DCUSTOM_DPC_PRIO_SETTING=99
 
@@ -152,11 +152,17 @@ ifneq ($(CONFIG_BCM4339),)
 endif
 
 ifneq ($(CONFIG_BCMDHD_SDIO),)
-  DHDCFLAGS += -DBDC -DOOB_INTR_ONLY -DDHD_BCMEVENTS -DMMC_SDIO_ABORT
+  DHDCFLAGS += -DBDC -DDHD_BCMEVENTS -DMMC_SDIO_ABORT
   DHDCFLAGS += -DBCMSDIO -DBCMLXSDMMC -DUSE_SDIOFIFO_IOVAR
   DHDCFLAGS += -DPROP_TXSTATUS
 endif
 
+ifeq ($(CONFIG_BCMDHD_HW_OOB),y)
+ DHDCFLAGS += -DHW_OOB -DOOB_INTR_ONLY
+else
+ DHDCFLAGS += -DSDIO_ISR_THREAD
+endif
+
 ifneq ($(CONFIG_BCMDHD_PCIE),)
   DHDCFLAGS += -DPCIE_FULL_DONGLE -DBCMPCIE -DCUSTOM_DPC_PRIO_SETTING=-1
 endif

diff --git a/drivers/net/wireless/bcmdhd/Kconfig b/drivers/net/wireless/bcmdhd/Kconfig
old mode 100755 (executable)
new mode 100644 (file)
index 043381b..2d6ac7e
--- a/drivers/net/wireless/bcmdhd/Kconfig
+++ b/drivers/net/wireless/bcmdhd/Kconfig
@@ -41,6 +41,13 @@ config BCMDHD_NVRAM_PATH
        ---help---
          Path to the calibration file.
 
+config BCMDHD_HW_OOB
+       bool "Use out of band interrupt"
+       depends on BCMDHD
+       default y
+       ---help---
+         Use out of band interrupt for card interrupt and wake on wireless.
+
 config BCMDHD_WEXT
        bool "Enable WEXT support"
        depends on BCMDHD && CFG80211 = n

diff --git a/drivers/net/wireless/bcmdhd/Makefile b/drivers/net/wireless/bcmdhd/Makefile
old mode 100755 (executable)
new mode 100644 (file)
index f91b4db..4abc69d
--- a/drivers/net/wireless/bcmdhd/Makefile
+++ b/drivers/net/wireless/bcmdhd/Makefile
@@ -94,7 +94,7 @@ DHDCFLAGS += -DWL_ENABLE_P2P_IF
 ##########################
 DRIVER_TYPE ?= $(CONFIG_BCMDHD)
 
-DHDCFLAGS += -DBCM4339_CHIP -DBCM43241_CHIP -DBCM4354_CHIP -DHW_OOB
+DHDCFLAGS += -DBCM4339_CHIP -DBCM43241_CHIP -DBCM4354_CHIP
 DHDCFLAGS += -DPROP_TXSTATUS_VSDB
 DHDCFLAGS += -DCUSTOM_DPC_PRIO_SETTING=99
 
@@ -152,11 +152,17 @@ ifneq ($(CONFIG_BCM4339),)
 endif
 
 ifneq ($(CONFIG_BCMDHD_SDIO),)
-  DHDCFLAGS += -DBDC -DOOB_INTR_ONLY -DDHD_BCMEVENTS -DMMC_SDIO_ABORT
+  DHDCFLAGS += -DBDC -DDHD_BCMEVENTS -DMMC_SDIO_ABORT
   DHDCFLAGS += -DBCMSDIO -DBCMLXSDMMC -DUSE_SDIOFIFO_IOVAR
   DHDCFLAGS += -DPROP_TXSTATUS
 endif
 
+ifeq ($(CONFIG_BCMDHD_HW_OOB),y)
+ DHDCFLAGS += -DHW_OOB -DOOB_INTR_ONLY
+else
+ DHDCFLAGS += -DSDIO_ISR_THREAD
+endif
+
 ifneq ($(CONFIG_BCMDHD_PCIE),)
   DHDCFLAGS += -DPCIE_FULL_DONGLE -DBCMPCIE -DCUSTOM_DPC_PRIO_SETTING=-1
 endif