diff options
author | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2014-04-15 06:28:06 -0400 |
---|---|---|
committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2014-05-07 12:28:40 -0400 |
commit | 8be1c477d5c860841298a970ebc102311cc7273a (patch) | |
tree | a88235b4ca9ab05d3ac7492d57eb6f803dcc4534 /arch/arm/configs/at91sam9rl_defconfig | |
parent | 9d9716255f34daf04ab428cab254f8ffbab89fb7 (diff) |
ARM: at91: sam9rl: switch from atmel_tsadcc to at91_adc
atmel_tsadcc is not allowing to use the remaining ADC channels while at91_adc
does. Completely switch to at91_adc and remove the tsadcc platform_data for
at91sam9rl and at91sam9rl based boards.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'arch/arm/configs/at91sam9rl_defconfig')
-rw-r--r-- | arch/arm/configs/at91sam9rl_defconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/configs/at91sam9rl_defconfig b/arch/arm/configs/at91sam9rl_defconfig index 85f846ae9ff2..5d7797d43d23 100644 --- a/arch/arm/configs/at91sam9rl_defconfig +++ b/arch/arm/configs/at91sam9rl_defconfig | |||
@@ -45,7 +45,6 @@ CONFIG_INPUT_EVDEV=y | |||
45 | # CONFIG_INPUT_KEYBOARD is not set | 45 | # CONFIG_INPUT_KEYBOARD is not set |
46 | # CONFIG_INPUT_MOUSE is not set | 46 | # CONFIG_INPUT_MOUSE is not set |
47 | CONFIG_INPUT_TOUCHSCREEN=y | 47 | CONFIG_INPUT_TOUCHSCREEN=y |
48 | CONFIG_TOUCHSCREEN_ATMEL_TSADCC=y | ||
49 | # CONFIG_SERIO is not set | 48 | # CONFIG_SERIO is not set |
50 | CONFIG_SERIAL_ATMEL=y | 49 | CONFIG_SERIAL_ATMEL=y |
51 | CONFIG_SERIAL_ATMEL_CONSOLE=y | 50 | CONFIG_SERIAL_ATMEL_CONSOLE=y |
@@ -65,6 +64,8 @@ CONFIG_MMC=y | |||
65 | CONFIG_MMC_ATMELMCI=m | 64 | CONFIG_MMC_ATMELMCI=m |
66 | CONFIG_RTC_CLASS=y | 65 | CONFIG_RTC_CLASS=y |
67 | CONFIG_RTC_DRV_AT91SAM9=y | 66 | CONFIG_RTC_DRV_AT91SAM9=y |
67 | CONFIG_IIO=y | ||
68 | CONFIG_AT91_ADC=y | ||
68 | CONFIG_EXT2_FS=y | 69 | CONFIG_EXT2_FS=y |
69 | CONFIG_MSDOS_FS=y | 70 | CONFIG_MSDOS_FS=y |
70 | CONFIG_VFAT_FS=y | 71 | CONFIG_VFAT_FS=y |