summaryrefslogtreecommitdiff
path: root/arch/arm/configs/imx_v4_v5_defconfig
diff options
context:
space:
mode:
authorDenis Carikli <denis@eukrea.com>2015-12-14 14:53:54 +0100
committerShawn Guo <shawnguo@kernel.org>2016-02-14 09:56:25 +0800
commit72dbe155f32117dfe0cff851ad150472fa2f3f66 (patch)
tree3ab701428c64cc1ef3edb49a1ff9d96029113ce6 /arch/arm/configs/imx_v4_v5_defconfig
parentf9e37c683c8a0a2a200181dab2b784a126e0b106 (diff)
ARM: imx_v4_v5_defconfig: Add I.MX25 Touchscreen controller and ADC support.
Signed-off-by: Denis Carikli <denis@eukrea.com> Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Diffstat (limited to 'arch/arm/configs/imx_v4_v5_defconfig')
-rw-r--r--arch/arm/configs/imx_v4_v5_defconfig4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig
index d3a8018639de..d6754ac47788 100644
--- a/arch/arm/configs/imx_v4_v5_defconfig
+++ b/arch/arm/configs/imx_v4_v5_defconfig
@@ -88,6 +88,7 @@ CONFIG_KEYBOARD_IMX=y
# CONFIG_INPUT_MOUSE is not set
CONFIG_INPUT_TOUCHSCREEN=y
CONFIG_TOUCHSCREEN_ADS7846=m
+CONFIG_TOUCHSCREEN_MX25=y
CONFIG_TOUCHSCREEN_MC13783=y
# CONFIG_LEGACY_PTYS is not set
CONFIG_SERIAL_8250=m
@@ -107,6 +108,7 @@ CONFIG_HWMON=m
CONFIG_SENSORS_MC13783_ADC=m
CONFIG_WATCHDOG=y
CONFIG_IMX2_WDT=y
+CONFIG_MFD_MX25_TSADC=y
CONFIG_MFD_MC13XXX_SPI=y
CONFIG_REGULATOR=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y
@@ -172,6 +174,8 @@ CONFIG_DMADEVICES=y
CONFIG_IMX_SDMA=y
CONFIG_IMX_DMA=y
# CONFIG_IOMMU_SUPPORT is not set
+CONFIG_IIO=y
+CONFIG_FSL_MX25_ADC=y
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
CONFIG_EXT4_FS=y