Commit a85ccf3a authored by Stefan Wahren's avatar Stefan Wahren Committed by Shawn Guo

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: default avatarStefan Wahren <stefan.wahren@i2se.com>
Reviewed-by: default avatarFabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent a4c584e4
...@@ -76,6 +76,7 @@ CONFIG_INPUT_EVDEV=y ...@@ -76,6 +76,7 @@ CONFIG_INPUT_EVDEV=y
# CONFIG_INPUT_KEYBOARD is not set # CONFIG_INPUT_KEYBOARD is not set
# CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_MOUSE is not set
CONFIG_INPUT_TOUCHSCREEN=y CONFIG_INPUT_TOUCHSCREEN=y
CONFIG_TOUCHSCREEN_MXS_LRADC=y
CONFIG_TOUCHSCREEN_TSC2007=m CONFIG_TOUCHSCREEN_TSC2007=m
# CONFIG_SERIO is not set # CONFIG_SERIO is not set
CONFIG_DEVPTS_MULTIPLE_INSTANCES=y CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
...@@ -96,6 +97,7 @@ CONFIG_GPIO_SYSFS=y ...@@ -96,6 +97,7 @@ CONFIG_GPIO_SYSFS=y
# CONFIG_HWMON is not set # CONFIG_HWMON is not set
CONFIG_WATCHDOG=y CONFIG_WATCHDOG=y
CONFIG_STMP3XXX_RTC_WATCHDOG=y CONFIG_STMP3XXX_RTC_WATCHDOG=y
CONFIG_MFD_MXS_LRADC=y
CONFIG_REGULATOR=y CONFIG_REGULATOR=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_REGULATOR_FIXED_VOLTAGE=y
CONFIG_FB=y CONFIG_FB=y
...@@ -137,10 +139,9 @@ CONFIG_RTC_DRV_DS1307=m ...@@ -137,10 +139,9 @@ CONFIG_RTC_DRV_DS1307=m
CONFIG_RTC_DRV_STMP=y CONFIG_RTC_DRV_STMP=y
CONFIG_DMADEVICES=y CONFIG_DMADEVICES=y
CONFIG_MXS_DMA=y CONFIG_MXS_DMA=y
CONFIG_STAGING=y
CONFIG_MXS_LRADC=y
CONFIG_IIO=y CONFIG_IIO=y
CONFIG_IIO_SYSFS_TRIGGER=y CONFIG_IIO_SYSFS_TRIGGER=y
CONFIG_MXS_LRADC_ADC=y
CONFIG_PWM=y CONFIG_PWM=y
CONFIG_PWM_MXS=y CONFIG_PWM_MXS=y
CONFIG_NVMEM=y CONFIG_NVMEM=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