summaryrefslogtreecommitdiff
path: root/arch/arm64/configs/defconfig
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2019-11-09 15:34:34 +0100
committerPhilippe Schenker <philippe.schenker@toradex.com>2020-08-13 16:05:00 +0200
commit547c560c2d58557f2f5c98981c5fc106149abb5e (patch)
treea2140d71f13ce08415507e39e59964d452466d4b /arch/arm64/configs/defconfig
parent3e0b34986574ab31ebe02766ca79775613562980 (diff)
arm64: defconfig: add marvell wi-fi support
On Verdin iMX8MM the Wi-Fi module is connected through SDIO. Add this driver variant. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit 22a713643448fa65365e8b9a2182ee2139939ffb) Conflicts: arch/arm64/configs/defconfig Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'arch/arm64/configs/defconfig')
-rw-r--r--arch/arm64/configs/defconfig5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 89b01da608f6..7ecb76a4d46a 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -184,6 +184,7 @@ CONFIG_BT_HIDP=y
CONFIG_BT_LEDS=y
# CONFIG_BT_DEBUGFS is not set
CONFIG_BT_HCIBTUSB=m
+CONFIG_BT_HCIBTSDIO=m
CONFIG_BT_HCIUART=y
CONFIG_BT_HCIUART_BCSP=y
CONFIG_BT_HCIUART_ATH3K=y
@@ -191,7 +192,10 @@ CONFIG_BT_HCIUART_LL=y
CONFIG_BT_HCIUART_3WIRE=y
CONFIG_BT_HCIUART_BCM=y
CONFIG_BT_HCIUART_QCA=y
+CONFIG_BT_HCIUART_MRVL=y
CONFIG_BT_HCIVHCI=y
+CONFIG_BT_MRVL=y
+CONFIG_BT_MRVL_SDIO=y
CONFIG_CFG80211=y
CONFIG_NL80211_TESTMODE=y
CONFIG_CFG80211_WEXT=y
@@ -358,6 +362,7 @@ CONFIG_BRCMFMAC=m
CONFIG_BRCMFMAC_PCIE=y
CONFIG_HOSTAP=y
CONFIG_MWIFIEX=m
+CONFIG_MWIFIEX_SDIO=m
CONFIG_MWIFIEX_PCIE=m
CONFIG_MWIFIEX_USB=m
CONFIG_MWL8K=m