MLK-14766: bcmdhd: Fix compile issue when building MMC subsystem as module

Re-apply Dong Aisheng's patch for MLK-13190, as the issue
reappeared with bcmdhd update v1.141.100.6:

BCMDHD_SDIO needs to be tristate for the correct dependency
of MMC core subsystem.
And the old driver buildin mode is static defined by DRIVER_TYPE.
Fix it to depend on CONFIG_BCMDHD_SDIO.

Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
Signed-off-by: Tiberiu Breana <andrei-tiberiu.breana@nxp.com>

diff --git a/drivers/net/wireless/bcmdhd/Kconfig b/drivers/net/wireless/bcmdhd/Kconfig
index acc85e2..7234910 100644 (file)
--- a/drivers/net/wireless/bcmdhd/Kconfig
+++ b/drivers/net/wireless/bcmdhd/Kconfig
@@ -8,7 +8,7 @@ config BCMDHD
          unsure.
 
 config BCMDHD_SDIO
-       bool "SDIO bus interface support"
+       tristate "SDIO bus interface support"
        depends on BCMDHD && MMC
 
 config BCMDHD_PCIE

diff --git a/drivers/net/wireless/bcmdhd/Makefile b/drivers/net/wireless/bcmdhd/Makefile
index 03c8618..c9542d9 100644 (file)
--- a/drivers/net/wireless/bcmdhd/Makefile
+++ b/drivers/net/wireless/bcmdhd/Makefile
@@ -106,9 +106,9 @@ endif
 # m: module type driver
 # y: built-in type driver
 ##########################
-DRIVER_TYPE ?= y
+#DRIVER_TYPE ?= y
 
-ifeq ($(DRIVER_TYPE), y)
+ifeq ($(CONFIG_BCMDHD_SDIO), y)
   DHDCFLAGS += -DENABLE_INSMOD_NO_FW_LOAD
 else
   DHDCFLAGS += -DNO_SDIO_RESET
@@ -214,7 +214,7 @@ ifneq ($(CONFIG_BCMDHD_PCIE),)
 endif
 
 bcmdhd-objs := $(DHDOFILES)
-obj-$(DRIVER_TYPE)   += bcmdhd.o
+obj-$(CONFIG_BCMDHD_SDIO)   += bcmdhd.o
 
 all:
        @echo "$(MAKE) --no-print-directory -C $(KDIR) SUBDIRS=$(CURDIR) modules"