diff options
| author | Seshagir.H <sholi@nvidia.com> | 2014-05-02 16:55:30 +0530 |
|---|---|---|
| committer | Riham Haidar <rhaidar@nvidia.com> | 2014-05-23 12:46:08 -0700 |
| commit | da305a691cdbaf37bc09dd203abcf5c2278fc738 (patch) | |
| tree | adf3dab5d9f02a68cd081ab56651c2588da74c6f /drivers/net | |
| parent | 1937ef6f9ce114ad8a9cac6a06e3dce8a1affae2 (diff) | |
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>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/bcm43241/Makefile | 10 | ||||
| -rw-r--r--[-rwxr-xr-x] | drivers/net/wireless/bcmdhd/Kconfig | 7 | ||||
| -rw-r--r--[-rwxr-xr-x] | drivers/net/wireless/bcmdhd/Makefile | 10 |
3 files changed, 23 insertions, 4 deletions
diff --git a/drivers/net/wireless/bcm43241/Makefile b/drivers/net/wireless/bcm43241/Makefile index 3e15b764d672..5755e34927bf 100644 --- 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 index 043381ba58f6..2d6ac7e481e6 100755..100644 --- 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 index f91b4db9b1bd..4abc69d1884d 100755..100644 --- 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 |