From: Sébastien Szymanski Date: Fri, 15 May 2015 13:44:28 +0000 (+0200) Subject: ARM: imx_v6_v7_defconfig: updates for Armadeus Systems APF6 boards X-Git-Tag: v4.2-rc1~97^2~6^2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f218e14b62339c6c28aa0c419eba200463cec99a;p=karo-tx-linux.git ARM: imx_v6_v7_defconfig: updates for Armadeus Systems APF6 boards APF6 Dual and Quad SoM have an wl1271 wifi/bt chip. This chip needs CONFIG_BT_HCIUART_LL. APF6Dev carrier board has a SX8654 I2C touchscreen controller. Signed-off-by: Sébastien Szymanski Signed-off-by: Shawn Guo --- diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig index d9bd6b20369c..b47863d49ac6 100644 --- a/arch/arm/configs/imx_v6_v7_defconfig +++ b/arch/arm/configs/imx_v6_v7_defconfig @@ -75,6 +75,7 @@ CONFIG_CAN=y CONFIG_CAN_FLEXCAN=y CONFIG_BT=y CONFIG_BT_HCIUART=y +CONFIG_BT_HCIUART_LL=y CONFIG_BT_HCIUART_3WIRE=y CONFIG_CFG80211=y CONFIG_MAC80211=y @@ -141,6 +142,10 @@ CONFIG_USB_RTL8152=m CONFIG_USB_USBNET=m CONFIG_USB_NET_CDC_EEM=m CONFIG_BRCMFMAC=m +CONFIG_WL_TI=y +CONFIG_WL12XX=m +CONFIG_WLCORE_SDIO=m +# CONFIG_WILINK_PLATFORM_DATA is not set # CONFIG_INPUT_MOUSEDEV_PSAUX is not set CONFIG_INPUT_EVDEV=y CONFIG_INPUT_EVBUG=m @@ -153,6 +158,7 @@ CONFIG_TOUCHSCREEN_EGALAX=y CONFIG_TOUCHSCREEN_MC13783=y CONFIG_TOUCHSCREEN_TSC2007=y CONFIG_TOUCHSCREEN_STMPE=y +CONFIG_TOUCHSCREEN_SX8654=y CONFIG_INPUT_MISC=y CONFIG_INPUT_MMA8450=y CONFIG_SERIO_SERPORT=m