staging: iio: ad7780: moving ad7780 out of staging

Move ad7780 ADC driver out of staging and into the mainline.

The ad7780 is a sigma-delta analog to digital converter. This driver provides
reading voltage values and status bits from both the ad778x and ad717x series.
Its interface also allows writing on the FILTER and GAIN GPIO pins on the
ad778x.

Signed-off-by: Renato Lui Geh <renatogeh@gmail.com>
Signed-off-by: Giuliano Belinassi <giuliano.belinassi@usp.br>
Co-developed-by: Giuliano Belinassi <giuliano.belinassi@usp.br>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
index 065065cf199890096e8bd5c62d9bdc2c7cb9ee7c..846c7ace4b962ecd0426dedfe10e2309505d9029 100644 (file)
--- a/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@ -124,6 +124,18 @@ config AD7768_1
          To compile this driver as a module, choose M here: the module will be
          called ad7768-1.
 
+config AD7780
+       tristate "Analog Devices AD7780 and similar ADCs driver"
+       depends on SPI
+       depends on GPIOLIB || COMPILE_TEST
+       select AD_SIGMA_DELTA
+       help
+         Say yes here to build support for Analog Devices AD7170, AD7171,
+         AD7780 and AD7781 SPI analog to digital converters (ADC).
+
+         To compile this driver as a module, choose M here: the
+         module will be called ad7780.
+
 config AD7791
        tristate "Analog Devices AD7791 ADC driver"
        depends on SPI

diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile
index 6fcebd1675244abde871417ff586ed0aca3d0c27..085a7512f8df726172c0069310356a3ce9c55e5f 100644 (file)
--- a/drivers/iio/adc/Makefile
+++ b/drivers/iio/adc/Makefile
@@ -16,6 +16,7 @@ obj-$(CONFIG_AD7606_IFACE_SPI) += ad7606_spi.o
 obj-$(CONFIG_AD7606) += ad7606.o
 obj-$(CONFIG_AD7766) += ad7766.o
 obj-$(CONFIG_AD7768_1) += ad7768-1.o
+obj-$(CONFIG_AD7780) += ad7780.o
 obj-$(CONFIG_AD7791) += ad7791.o
 obj-$(CONFIG_AD7793) += ad7793.o
 obj-$(CONFIG_AD7887) += ad7887.o

diff --git a/drivers/staging/iio/adc/ad7780.c b/drivers/iio/adc/ad7780.c
similarity index 100%
rename from drivers/staging/iio/adc/ad7780.c
rename to drivers/iio/adc/ad7780.c

diff --git a/drivers/staging/iio/adc/Kconfig b/drivers/staging/iio/adc/Kconfig
index 7a93d3a5c1139d1ef968d82fbb0d51c0992e5dd9..404a53c743a6c999cedd5c424d0f4434a31561a4 100644 (file)
--- a/drivers/staging/iio/adc/Kconfig
+++ b/drivers/staging/iio/adc/Kconfig
@@ -3,19 +3,6 @@
 #
 menu "Analog to digital converters"
 
-config AD7780
-       tristate "Analog Devices AD7780 and similar ADCs driver"
-       depends on SPI
-       depends on GPIOLIB || COMPILE_TEST
-       select AD_SIGMA_DELTA
-       help
-         Say yes here to build support for Analog Devices AD7170, AD7171,
-         AD7780 and AD7781 SPI analog to digital converters (ADC).
-         If unsure, say N (but it's safe to say "Y").
-
-         To compile this driver as a module, choose M here: the
-         module will be called ad7780.
-
 config AD7816
        tristate "Analog Devices AD7816/7/8 temperature sensor and ADC driver"
        depends on SPI

diff --git a/drivers/staging/iio/adc/Makefile b/drivers/staging/iio/adc/Makefile
index 7a421088ff82ddcf3edb9dd9e0e5f1d1a9fd086b..4b76769b32bc51ee98e32e0aa5e20e7210b15795 100644 (file)
--- a/drivers/staging/iio/adc/Makefile
+++ b/drivers/staging/iio/adc/Makefile
@@ -3,7 +3,6 @@
 # Makefile for industrial I/O ADC drivers
 #
 
-obj-$(CONFIG_AD7780) += ad7780.o
 obj-$(CONFIG_AD7816) += ad7816.o
 obj-$(CONFIG_AD7192) += ad7192.o
 obj-$(CONFIG_AD7280) += ad7280a.o