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

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

diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
index 38bc319904c4c2998c040e8a05bdcbd3f55e9088..8e7764c3cc84063c5290c5945aaa2d2519408c62 100644 (file)
--- a/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@ -247,6 +247,25 @@ config HI8435
          This driver can also be built as a module. If so, the module will be
          called hi8435.
 
+config HX711
+       tristate "AVIA HX711 ADC for weight cells"
+       depends on GPIOLIB
+       help
+         If you say yes here you get support for AVIA HX711 ADC which is used
+         for weigh cells
+
+         This driver uses two GPIOs, one acts as the clock and controls the
+         channel selection and gain, the other one is used for the measurement
+          data
+
+         Currently the raw value is read from the chip and delivered.
+         To get an actual weight one needs to subtract the
+         zero offset and multiply by a scale factor.
+         This should be done in userspace.
+
+         This driver can also be built as a module. If so, the module will be
+         called hx711.
+
 config INA2XX_ADC
        tristate "Texas Instruments INA2xx Power Monitors IIO driver"
        depends on I2C && !SENSORS_INA2XX
@@ -549,6 +568,19 @@ config TI_ADS1015
          This driver can also be built as a module. If so, the module will be
          called ti-ads1015.
 
+config TI_ADS7950
+       tristate "Texas Instruments ADS7950 ADC driver"
+       depends on SPI
+       select IIO_BUFFER
+       select IIO_TRIGGERED_BUFFER
+       help
+         Say yes here to build support for Texas Instruments ADS7950, ADS7951,
+         ADS7952, ADS7953, ADS7954, ADS7955, ADS7956, ADS7957, ADS7958, ADS7959.
+         ADS7960, ADS7961.
+
+         To compile this driver as a module, choose M here: the
+         module will be called ti-ads7950.
+
 config TI_ADS8688
        tristate "Texas Instruments ADS8688"
        depends on SPI && OF
@@ -561,7 +593,7 @@ config TI_ADS8688
 
 config TI_AM335X_ADC
        tristate "TI's AM335X ADC driver"
-       depends on MFD_TI_AM335X_TSCADC
+       depends on MFD_TI_AM335X_TSCADC && HAS_DMA
        select IIO_BUFFER
        select IIO_KFIFO_BUF
        help