staging: iio: adc: ad7606: Move out of staging

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

Signed-off-by: Stefan Popa <stefan.popa@analog.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index db9fcf2..bc9f816 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -854,6 +854,13 @@ S: Supported
 F:     drivers/iio/adc/ad7124.c
 F:     Documentation/devicetree/bindings/iio/adc/adi,ad7124.txt
 
+ANALOG DEVICES INC AD7606 DRIVER
+M:     Stefan Popa <stefan.popa@analog.com>
+L:     linux-iio@vger.kernel.org
+W:     http://ez.analog.com/community/linux-device-drivers
+S:     Supported
+F:     drivers/iio/adc/ad7606.c
+
 ANALOG DEVICES INC AD9389B DRIVER
 M:     Hans Verkuil <hans.verkuil@cisco.com>
 L:     linux-media@vger.kernel.org

diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
index 7a3ca4e..f3cc7a3 100644 (file)
--- a/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@ -69,6 +69,33 @@ config AD7476
          To compile this driver as a module, choose M here: the
          module will be called ad7476.
 
+config AD7606
+       tristate
+       select IIO_BUFFER
+       select IIO_TRIGGERED_BUFFER
+
+config AD7606_IFACE_PARALLEL
+       tristate "Analog Devices AD7606 ADC driver with parallel interface support"
+       depends on HAS_IOMEM
+       select AD7606
+       help
+         Say yes here to build parallel interface support for Analog Devices:
+         ad7605-4, ad7606, ad7606-6, ad7606-4 analog to digital converters (ADC).
+
+         To compile this driver as a module, choose M here: the
+         module will be called ad7606_parallel.
+
+config AD7606_IFACE_SPI
+       tristate "Analog Devices AD7606 ADC driver with spi interface support"
+       depends on SPI
+       select AD7606
+       help
+         Say yes here to build spi interface support for Analog Devices:
+         ad7605-4, ad7606, ad7606-6, ad7606-4 analog to digital converters (ADC).
+
+         To compile this driver as a module, choose M here: the
+         module will be called ad7606_spi.
+
 config AD7766
        tristate "Analog Devices AD7766/AD7767 ADC driver"
        depends on SPI_MASTER

diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile
index 07df37f..ea50313 100644 (file)
--- a/drivers/iio/adc/Makefile
+++ b/drivers/iio/adc/Makefile
@@ -11,6 +11,9 @@ obj-$(CONFIG_AD7291) += ad7291.o
 obj-$(CONFIG_AD7298) += ad7298.o
 obj-$(CONFIG_AD7923) += ad7923.o
 obj-$(CONFIG_AD7476) += ad7476.o
+obj-$(CONFIG_AD7606_IFACE_PARALLEL) += ad7606_par.o
+obj-$(CONFIG_AD7606_IFACE_SPI) += ad7606_spi.o
+obj-$(CONFIG_AD7606) += ad7606.o
 obj-$(CONFIG_AD7766) += ad7766.o
 obj-$(CONFIG_AD7791) += ad7791.o
 obj-$(CONFIG_AD7793) += ad7793.o

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

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

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

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

diff --git a/drivers/staging/iio/adc/Kconfig b/drivers/staging/iio/adc/Kconfig
index 302639a..7a93d3a 100644 (file)
--- a/drivers/staging/iio/adc/Kconfig
+++ b/drivers/staging/iio/adc/Kconfig
@@ -3,33 +3,6 @@
 #
 menu "Analog to digital converters"
 
-config AD7606
-       tristate
-       select IIO_BUFFER
-       select IIO_TRIGGERED_BUFFER
-
-config AD7606_IFACE_PARALLEL
-       tristate "Analog Devices AD7606 ADC driver with parallel interface support"
-       depends on HAS_IOMEM
-       select AD7606
-       help
-         Say yes here to build parallel interface support for Analog Devices:
-         ad7605-4, ad7606, ad7606-6, ad7606-4 analog to digital converters (ADC).
-
-         To compile this driver as a module, choose M here: the
-         module will be called ad7606_parallel.
-
-config AD7606_IFACE_SPI
-       tristate "Analog Devices AD7606 ADC driver with spi interface support"
-       depends on SPI
-       select AD7606
-       help
-         Say yes here to build spi interface support for Analog Devices:
-         ad7605-4, ad7606, ad7606-6, ad7606-4 analog to digital converters (ADC).
-
-         To compile this driver as a module, choose M here: the
-         module will be called ad7606_spi.
-
 config AD7780
        tristate "Analog Devices AD7780 and similar ADCs driver"
        depends on SPI

diff --git a/drivers/staging/iio/adc/Makefile b/drivers/staging/iio/adc/Makefile
index ebe83c1..7a42108 100644 (file)
--- a/drivers/staging/iio/adc/Makefile
+++ b/drivers/staging/iio/adc/Makefile
@@ -3,10 +3,6 @@
 # Makefile for industrial I/O ADC drivers
 #
 
-obj-$(CONFIG_AD7606_IFACE_PARALLEL) += ad7606_par.o
-obj-$(CONFIG_AD7606_IFACE_SPI) += ad7606_spi.o
-obj-$(CONFIG_AD7606) += ad7606.o
-
 obj-$(CONFIG_AD7780) += ad7780.o
 obj-$(CONFIG_AD7816) += ad7816.o
 obj-$(CONFIG_AD7192) += ad7192.o