Commit c413d7ba authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'imx-defconfig-4.2' of...

Merge tag 'imx-defconfig-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/defconfig

Merge "The i.MX defconfig updates for 4.2" from Shawn Guo:

 - Enable i.MX7D and LS1021A SoC support
 - Enable support for WL1271 WIFI/BT, SX8654 I2C touchscreen and PCF8523
   RTC, which can be found on Armadeus Systems APF6 and Cubox-i boards.

* tag 'imx-defconfig-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: imx_v6_v7_defconfig: updates for Armadeus Systems APF6 boards
  ARM: config: imx_v6_v7_defconfig add imx7d support
  ARM: imx_v6_v7_defconfig: Select LS1021A
  ARM: imx_v6_v7_defconfig: Enable RTC PCF8523 support
parents 3139c907 f218e14b
...@@ -38,7 +38,9 @@ CONFIG_SOC_IMX53=y ...@@ -38,7 +38,9 @@ CONFIG_SOC_IMX53=y
CONFIG_SOC_IMX6Q=y CONFIG_SOC_IMX6Q=y
CONFIG_SOC_IMX6SL=y CONFIG_SOC_IMX6SL=y
CONFIG_SOC_IMX6SX=y CONFIG_SOC_IMX6SX=y
CONFIG_SOC_IMX7D=y
CONFIG_SOC_VF610=y CONFIG_SOC_VF610=y
CONFIG_SOC_LS1021A=y
CONFIG_PCI=y CONFIG_PCI=y
CONFIG_PCI_IMX6=y CONFIG_PCI_IMX6=y
CONFIG_SMP=y CONFIG_SMP=y
...@@ -73,6 +75,7 @@ CONFIG_CAN=y ...@@ -73,6 +75,7 @@ CONFIG_CAN=y
CONFIG_CAN_FLEXCAN=y CONFIG_CAN_FLEXCAN=y
CONFIG_BT=y CONFIG_BT=y
CONFIG_BT_HCIUART=y CONFIG_BT_HCIUART=y
CONFIG_BT_HCIUART_LL=y
CONFIG_BT_HCIUART_3WIRE=y CONFIG_BT_HCIUART_3WIRE=y
CONFIG_CFG80211=y CONFIG_CFG80211=y
CONFIG_MAC80211=y CONFIG_MAC80211=y
...@@ -139,6 +142,10 @@ CONFIG_USB_RTL8152=m ...@@ -139,6 +142,10 @@ CONFIG_USB_RTL8152=m
CONFIG_USB_USBNET=m CONFIG_USB_USBNET=m
CONFIG_USB_NET_CDC_EEM=m CONFIG_USB_NET_CDC_EEM=m
CONFIG_BRCMFMAC=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_MOUSEDEV_PSAUX is not set
CONFIG_INPUT_EVDEV=y CONFIG_INPUT_EVDEV=y
CONFIG_INPUT_EVBUG=m CONFIG_INPUT_EVBUG=m
...@@ -151,6 +158,7 @@ CONFIG_TOUCHSCREEN_EGALAX=y ...@@ -151,6 +158,7 @@ CONFIG_TOUCHSCREEN_EGALAX=y
CONFIG_TOUCHSCREEN_MC13783=y CONFIG_TOUCHSCREEN_MC13783=y
CONFIG_TOUCHSCREEN_TSC2007=y CONFIG_TOUCHSCREEN_TSC2007=y
CONFIG_TOUCHSCREEN_STMPE=y CONFIG_TOUCHSCREEN_STMPE=y
CONFIG_TOUCHSCREEN_SX8654=y
CONFIG_INPUT_MISC=y CONFIG_INPUT_MISC=y
CONFIG_INPUT_MMA8450=y CONFIG_INPUT_MMA8450=y
CONFIG_SERIO_SERPORT=m CONFIG_SERIO_SERPORT=m
...@@ -283,6 +291,7 @@ CONFIG_RTC_CLASS=y ...@@ -283,6 +291,7 @@ CONFIG_RTC_CLASS=y
CONFIG_RTC_INTF_DEV_UIE_EMUL=y CONFIG_RTC_INTF_DEV_UIE_EMUL=y
CONFIG_RTC_DRV_DS1307=y CONFIG_RTC_DRV_DS1307=y
CONFIG_RTC_DRV_ISL1208=y CONFIG_RTC_DRV_ISL1208=y
CONFIG_RTC_DRV_PCF8523=y
CONFIG_RTC_DRV_PCF8563=y CONFIG_RTC_DRV_PCF8563=y
CONFIG_RTC_DRV_MC13XXX=y CONFIG_RTC_DRV_MC13XXX=y
CONFIG_RTC_DRV_MXC=y CONFIG_RTC_DRV_MXC=y
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment