summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2015-11-03 17:25:37 +0100
committerShawn Guo <shawnguo@kernel.org>2015-11-24 15:53:05 +0100
commit02dd3364a41ff4450daaf84b47ea49046f0d1776 (patch)
tree808d7c1fd9f6d18a79a18dc0493760864fe9cb66 /arch
parentARM: imx_v6_v7_defconfig: Remove CONFIG_SOC_LS1021A (diff)
downloadlinux-02dd3364a41ff4450daaf84b47ea49046f0d1776.tar.xz
linux-02dd3364a41ff4450daaf84b47ea49046f0d1776.zip
ARM: imx_v6_v7_defconfig: Select VF610_ADC
The vf610 adc driver is present on Vybrid, MX6SX, MX6UL and MX7D. Select it by default. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Acked-by: Fugang Duan <B38611@freescale.com> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/imx_v6_v7_defconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig
index d83e775a6be7..38f25a7e2aa8 100644
--- a/arch/arm/configs/imx_v6_v7_defconfig
+++ b/arch/arm/configs/imx_v6_v7_defconfig
@@ -314,6 +314,8 @@ CONFIG_MXS_DMA=y
CONFIG_FSL_EDMA=y
CONFIG_STAGING=y
# CONFIG_IOMMU_SUPPORT is not set
+CONFIG_IIO=y
+CONFIG_VF610_ADC=y
CONFIG_PWM=y
CONFIG_PWM_IMX=y
CONFIG_EXT2_FS=y