diff options
| author | Haibo Chen <haibo.chen@nxp.com> | 2016-04-26 11:08:32 +0800 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2016-06-24 14:46:29 +0200 |
| commit | b25d1b07a561d8ad174952571fdcfdf40b1d3d31 (patch) | |
| tree | b6f420c35f80e5dca137d2f2fa3e288ff29537de | |
| parent | 5e38fedc81d06ea06f13c037c6cb589d7b8ee8e1 (diff) | |
MLK-12706-2 net: bcmdhd: set the bcmdhd driver default build in
Bcmdhd wifi driver default build as module, now default build in
this wifi driver. To support this build in feature, this patch
add flag ENABLE_INSMOD_NO_FW_LOAD, and use extern function
sdio_reset_comm() as instead.
Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
| -rw-r--r-- | drivers/net/wireless/bcmdhd/Makefile | 4 | ||||
| -rw-r--r-- | drivers/net/wireless/bcmdhd/bcmsdh_sdmmc.c | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/drivers/net/wireless/bcmdhd/Makefile b/drivers/net/wireless/bcmdhd/Makefile index e15f5cc1c01f..c3fea8d3d041 100644 --- a/drivers/net/wireless/bcmdhd/Makefile +++ b/drivers/net/wireless/bcmdhd/Makefile @@ -20,6 +20,8 @@ DHDCFLAGS += -DWL_CFG80211 # Print out kernel panic point of file and line info when assertion happened DHDCFLAGS += -DBCMASSERT_LOG +DHDCFLAGS += -DENABLE_INSMOD_NO_FW_LOAD + # keepalive DHDCFLAGS += -DCUSTOM_KEEP_ALIVE_SETTING=28000 @@ -94,7 +96,7 @@ DHDCFLAGS += -DWL_IFACE_COMB_NUM_CHANNELS # m: module type driver # y: built-in type driver ########################## -DRIVER_TYPE ?= m +DRIVER_TYPE ?= y ######################### # Chip dependent feature diff --git a/drivers/net/wireless/bcmdhd/bcmsdh_sdmmc.c b/drivers/net/wireless/bcmdhd/bcmsdh_sdmmc.c index d1d71838fcc1..a2ac5c074ff8 100644 --- a/drivers/net/wireless/bcmdhd/bcmsdh_sdmmc.c +++ b/drivers/net/wireless/bcmdhd/bcmsdh_sdmmc.c @@ -59,12 +59,7 @@ static void IRQHandler(struct sdio_func *func); static void IRQHandlerF2(struct sdio_func *func); #endif /* !defined(OOB_INTR_ONLY) */ static int sdioh_sdmmc_get_cisaddr(sdioh_info_t *sd, uint32 regaddr); - -/* workaround to simply return 0 as suggested by Broadcom */ -static int sdio_reset_comm(struct mmc_card *card) -{ - return 0; -} +extern int sdio_reset_comm(struct mmc_card *card); #define DEFAULT_SDIO_F2_BLKSIZE 512 #ifndef CUSTOM_SDIO_F2_BLKSIZE |