Merge branch 'ib-mfd-iio-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/lee...

[karo-tx-linux.git] / drivers / iio / adc / Kconfig

diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
index db2681b4f24b337e54c63d3627d8057795ea31cf..bc4e787096e84c41ec04d3343a0a087f5620935f 100644 (file)
--- a/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@ -137,7 +137,7 @@ config AXP288_ADC
 
 config EXYNOS_ADC
        tristate "Exynos ADC driver support"
-       depends on ARCH_EXYNOS || (OF && COMPILE_TEST)
+       depends on ARCH_EXYNOS || ARCH_S3C24XX || ARCH_S3C64XX || (OF && COMPILE_TEST)
        help
          Core support for the ADC block found in the Samsung EXYNOS series
          of SoCs for drivers such as the touchscreen and hwmon to use to share
@@ -214,6 +214,16 @@ config NAU7802
          To compile this driver as a module, choose M here: the
          module will be called nau7802.
 
+config ROCKCHIP_SARADC
+       tristate "Rockchip SARADC driver"
+       depends on ARCH_ROCKCHIP || (ARM && COMPILE_TEST)
+       help
+         Say yes here to build support for the SARADC found in SoCs from
+         Rockchip.
+
+         To compile this driver as a module, choose M here: the
+         module will be called rockchip_saradc.
+
 config TI_ADC081C
        tristate "Texas Instruments ADC081C021/027"
        depends on I2C
@@ -224,6 +234,16 @@ config TI_ADC081C
          This driver can also be built as a module. If so, the module will be
          called ti-adc081c.
 
+config TI_ADC128S052
+       tristate "Texas Instruments ADC128S052"
+       depends on SPI
+       help
+         If you say yes here you get support for Texas Instruments ADC128S052
+         chip.
+
+         This driver can also be built as a module. If so, the module will be
+         called ti-adc128s052.
+
 config TI_AM335X_ADC
        tristate "TI's AM335X ADC driver"
        depends on MFD_TI_AM335X_TSCADC