diff options
| author | Stefan Wahren <stefan.wahren@i2se.com> | 2017-05-14 15:13:50 +0000 |
|---|---|---|
| committer | Shawn Guo <shawnguo@kernel.org> | 2017-05-15 20:37:19 +0800 |
| commit | a85ccf3a216d348fc26d857eb13ec3d72e87656d (patch) | |
| tree | 5cbedfddf6383e878c86c4152cce680049c6bcf9 /arch/arm/configs/mxs_defconfig | |
| parent | a4c584e43e710bef1962049d293a03d1427e129c (diff) | |
| download | talos-obmc-linux-a85ccf3a216d348fc26d857eb13ec3d72e87656d.tar.gz talos-obmc-linux-a85ccf3a216d348fc26d857eb13ec3d72e87656d.zip | |
ARM: mxs_defconfig: Re-enable MXS LRADC
The MXS LRADC driver left staging and has been split. So re-enable
the driver and remove the obsolete entries.
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Diffstat (limited to 'arch/arm/configs/mxs_defconfig')
| -rw-r--r-- | arch/arm/configs/mxs_defconfig | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/configs/mxs_defconfig b/arch/arm/configs/mxs_defconfig index 7b36ebbdcc1d..aef2b54a691c 100644 --- a/arch/arm/configs/mxs_defconfig +++ b/arch/arm/configs/mxs_defconfig @@ -76,6 +76,7 @@ CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_KEYBOARD is not set # CONFIG_INPUT_MOUSE is not set CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_MXS_LRADC=y CONFIG_TOUCHSCREEN_TSC2007=m # CONFIG_SERIO is not set CONFIG_DEVPTS_MULTIPLE_INSTANCES=y @@ -96,6 +97,7 @@ CONFIG_GPIO_SYSFS=y # CONFIG_HWMON is not set CONFIG_WATCHDOG=y CONFIG_STMP3XXX_RTC_WATCHDOG=y +CONFIG_MFD_MXS_LRADC=y CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_FB=y @@ -137,10 +139,9 @@ CONFIG_RTC_DRV_DS1307=m CONFIG_RTC_DRV_STMP=y CONFIG_DMADEVICES=y CONFIG_MXS_DMA=y -CONFIG_STAGING=y -CONFIG_MXS_LRADC=y CONFIG_IIO=y CONFIG_IIO_SYSFS_TRIGGER=y +CONFIG_MXS_LRADC_ADC=y CONFIG_PWM=y CONFIG_PWM_MXS=y CONFIG_NVMEM=y |
