Merge tag 'mfd-for-linus-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

[cascardo/linux.git] / drivers / iio / adc / Kconfig

diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
index 283ded7..af4aea7 100644 (file)
--- a/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@ -131,6 +131,16 @@ config AT91_ADC
          To compile this driver as a module, choose M here: the module will be
          called at91_adc.
 
+config AT91_SAMA5D2_ADC
+       tristate "Atmel AT91 SAMA5D2 ADC"
+       depends on ARCH_AT91 || COMPILE_TEST
+       help
+         Say yes here to build support for Atmel SAMA5D2 ADC which is
+         available on SAMA5D2 SoC family.
+
+         To compile this driver as a module, choose M here: the module will be
+         called at91-sama5d2_adc.
+
 config AXP288_ADC
        tristate "X-Powers AXP288 ADC driver"
        depends on MFD_AXP20X
@@ -184,6 +194,13 @@ config EXYNOS_ADC
          To compile this driver as a module, choose M here: the module will be
          called exynos_adc.
 
+config FSL_MX25_ADC
+       tristate "Freescale MX25 ADC driver"
+       depends on MFD_MX25_TSADC
+       help
+         Generic Conversion Queue driver used for general purpose ADC in the
+         MX25. This driver supports single measurements using the MX25 ADC.
+
 config HI8435
        tristate "Holt Integrated Circuits HI-8435 threshold detector"
        select IIO_TRIGGERED_EVENT
@@ -267,11 +284,11 @@ config MCP320X
          called mcp320x.
 
 config MCP3422
-       tristate "Microchip Technology MCP3422/3/4/6/7/8 driver"
+       tristate "Microchip Technology MCP3421/2/3/4/5/6/7/8 driver"
        depends on I2C
        help
-         Say yes here to build support for Microchip Technology's
-         MCP3422, MCP3423, MCP3424, MCP3426, MCP3427 or MCP3428
+         Say yes here to build support for Microchip Technology's MCP3421
+         MCP3422, MCP3423, MCP3424, MCP3425, MCP3426, MCP3427 or MCP3428
          analog to digital converters.
 
          This driver can also be built as a module. If so, the module will be
@@ -287,6 +304,20 @@ config MEN_Z188_ADC
          This driver can also be built as a module. If so, the module will be
          called men_z188_adc.
 
+config MXS_LRADC
+        tristate "Freescale i.MX23/i.MX28 LRADC"
+        depends on (ARCH_MXS || COMPILE_TEST) && HAS_IOMEM
+        depends on INPUT
+        select STMP_DEVICE
+        select IIO_BUFFER
+        select IIO_TRIGGERED_BUFFER
+        help
+          Say yes here to build support for i.MX23/i.MX28 LRADC convertor
+          built into these chips.
+
+          To compile this driver as a module, choose M here: the
+          module will be called mxs-lradc.
+
 config NAU7802
        tristate "Nuvoton NAU7802 ADC driver"
        depends on I2C
@@ -352,6 +383,16 @@ config TI_ADC081C
          This driver can also be built as a module. If so, the module will be
          called ti-adc081c.
 
+config TI_ADC0832
+       tristate "Texas Instruments ADC0831/ADC0832/ADC0834/ADC0838"
+       depends on SPI
+       help
+         If you say yes here you get support for Texas Instruments ADC0831,
+         ADC0832, ADC0834, ADC0838 ADC chips.
+
+         This driver can also be built as a module. If so, the module will be
+         called ti-adc0832.
+
 config TI_ADC128S052
        tristate "Texas Instruments ADC128S052/ADC122S021/ADC124S021"
        depends on SPI
@@ -362,6 +403,19 @@ config TI_ADC128S052
          This driver can also be built as a module. If so, the module will be
          called ti-adc128s052.
 
+config TI_ADS1015
+       tristate "Texas Instruments ADS1015 ADC"
+       depends on I2C && !SENSORS_ADS1015
+       select REGMAP_I2C
+       select IIO_BUFFER
+       select IIO_TRIGGERED_BUFFER
+       help
+         If you say yes here you get support for Texas Instruments ADS1015
+         ADC chip.
+
+         This driver can also be built as a module. If so, the module will be
+         called ti-ads1015.
+
 config TI_ADS8688
        tristate "Texas Instruments ADS8688"
        depends on SPI && OF