Merge tag 'iio-fixes-for-4.2a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23...

[firefly-linux-kernel-4.4.55.git] / drivers / iio / adc / Kconfig

diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
index 1bcb65b8d4a1a482b7754b99e39b0f5517435eb6..eb0cd897714a26b619b9e6c924ce4c3a65a5806b 100644 (file)
--- a/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@ -135,6 +135,13 @@ config AXP288_ADC
          device. Depending on platform configuration, this general purpose ADC can
          be used for sampling sensors such as thermal resistors.
 
+config BERLIN2_ADC
+       tristate "Marvell Berlin2 ADC driver"
+       depends on ARCH_BERLIN
+       help
+         Marvell Berlin2 ADC driver. This ADC has 8 channels, with one used for
+         temperature measurement.
+
 config DA9150_GPADC
        tristate "Dialog DA9150 GPADC driver support"
        depends on MFD_DA9150
@@ -284,11 +291,11 @@ config TI_ADC081C
          called ti-adc081c.
 
 config TI_ADC128S052
-       tristate "Texas Instruments ADC128S052"
+       tristate "Texas Instruments ADC128S052/ADC122S021"
        depends on SPI
        help
          If you say yes here you get support for Texas Instruments ADC128S052
-         chip.
+         and ADC122S021 chips.
 
          This driver can also be built as a module. If so, the module will be
          called ti-adc128s052.