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

[mirror_ubuntu-artful-kernel.git] / drivers / iio / adc / Kconfig

diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
index 427f75c4f69ef03c6c90d8c0c087d1f984c7842b..d86196cfe4b47091add5d756da6d3dbf7fded9eb 100644 (file)
--- a/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@ -155,6 +155,16 @@ config MCP3422
          This driver can also be built as a module. If so, the module will be
          called mcp3422.
 
+config MEN_Z188_ADC
+       tristate "MEN 16z188 ADC IP Core support"
+       depends on MCB
+       help
+         Say yes here to enable support for the MEN 16z188 ADC IP-Core on a MCB
+         carrier.
+
+         This driver can also be built as a module. If so, the module will be
+         called men_z188_adc.
+
 config NAU7802
        tristate "Nuvoton NAU7802 ADC driver"
        depends on I2C
@@ -207,6 +217,16 @@ config TWL6030_GPADC
          This driver can also be built as a module. If so, the module will be
          called twl6030-gpadc.
 
+config VF610_ADC
+       tristate "Freescale vf610 ADC driver"
+       depends on OF
+       help
+         Say yes here to support for Vybrid board analog-to-digital converter.
+         Since the IP is used for i.MX6SLX, the driver also support i.MX6SLX.
+
+         This driver can also be built as a module. If so, the module will be
+         called vf610_adc.
+
 config VIPERBOARD_ADC
        tristate "Viperboard ADC support"
        depends on MFD_VIPERBOARD && USB
@@ -214,4 +234,17 @@ config VIPERBOARD_ADC
          Say yes here to access the ADC part of the Nano River
          Technologies Viperboard.
 
+config XILINX_XADC
+       tristate "Xilinx XADC driver"
+       depends on ARCH_ZYNQ || MICROBLAZE || COMPILE_TEST
+       depends on HAS_IOMEM
+       select IIO_BUFFER
+       select IIO_TRIGGERED_BUFFER
+       help
+         Say yes here to have support for the Xilinx XADC. The driver does support
+         both the ZYNQ interface to the XADC as well as the AXI-XADC interface.
+
+         The driver can also be build as a module. If so, the module will be called
+         xilinx-xadc.
+
 endmenu