diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2013-12-09 16:29:12 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2018-12-24 01:27:26 +0100 |
| commit | 8a0cc368e527f1e977c2852aaa67b8d4c974a551 (patch) | |
| tree | d93a1ce8dbe8f389a7599a04427166e72affb98c /drivers/mfd | |
| parent | 76187654774f21989a7dca30e080d683da5a5516 (diff) | |
iio: adc: add STMPE ADC driver using IIO framework
This adds an ADC driver for the STMPE device using the industrial
input/output interface. The driver supports raw reading of values.
The driver depends on the MFD stmpe driver. If the touchscreen
block is enabled too, only four of the 8 ADC channels are available.
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
(cherry picked from commit dd00b720af8b66c0a30cbe1861cff83c931bb5be)
Conflicts:
drivers/mfd/Kconfig
drivers/staging/iio/adc/Kconfig
drivers/staging/iio/adc/Makefile
Adaptions due to staging iio subsystem changes:
drivers/staging/iio/adc/stmpe-adc.c
(cherry picked from commit 6b542ac0446a5822b6b0549a074725dc50e3cab3)
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index 07ab86a3a318..e5d22b6976a7 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -1065,7 +1065,7 @@ config MFD_STMPE Currently supported devices are: - STMPE811: GPIO, Touchscreen + STMPE811: GPIO, Touchscreen, ADC STMPE1601: GPIO, Keypad STMPE1801: GPIO, Keypad STMPE2401: GPIO, Keypad @@ -1078,6 +1078,7 @@ config MFD_STMPE GPIO: stmpe-gpio Keypad: stmpe-keypad Touchscreen: stmpe-ts + ADC: stmpe-adc menu "STMicroelectronics STMPE Interface Drivers" depends on MFD_STMPE |