Merge remote-tracking branch 'staging/staging-next'

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

diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
index 767577298ee3bd9f2cc06814f91a889d503aa589..586830ec880052a8408fc882ff4e71d403c8bb84 100644 (file)
--- a/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@ -317,6 +317,19 @@ config MCP3422
          This driver can also be built as a module. If so, the module will be
          called mcp3422.
 
+config MEDIATEK_MT6577_AUXADC
+        tristate "MediaTek AUXADC driver"
+        depends on ARCH_MEDIATEK || COMPILE_TEST
+        depends on HAS_IOMEM
+        help
+          Say yes here to enable support for MediaTek mt65xx AUXADC.
+
+          The driver supports immediate mode operation to read from one of sixteen
+          channels (external or internal).
+
+          This driver can also be built as a module. If so, the module will be
+          called mt6577_auxadc.
+
 config MEN_Z188_ADC
        tristate "MEN 16z188 ADC IP Core support"
        depends on MCB
@@ -427,6 +440,18 @@ config TI_ADC128S052
          This driver can also be built as a module. If so, the module will be
          called ti-adc128s052.
 
+config TI_ADC161S626
+       tristate "Texas Instruments ADC161S626 1-channel differential ADC"
+       depends on SPI
+       select IIO_BUFFER
+       select IIO_TRIGGERED_BUFFER
+       help
+         If you say yes here you get support for Texas Instruments ADC141S626,
+         and ADC161S626 chips.
+
+         This driver can also be built as a module. If so, the module will be
+         called ti-adc161s626.
+
 config TI_ADS1015
        tristate "Texas Instruments ADS1015 ADC"
        depends on I2C && !SENSORS_ADS1015