staging: iio: adc: ad7192: move out of staging

Move ad7192 ADC driver out of staging into mainline.

Signed-off-by: Alexandru Tachici <alexandru.tachici@analog.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index 11b7d21eaa6cec08c3fbd88fdafc1afe8988b482..8fa40c3eb72a7343d0f0e6a6096a3ccbba4e28f9 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -931,6 +931,14 @@ S: Supported
 F:     drivers/iio/adc/ad7124.c
 F:     Documentation/devicetree/bindings/iio/adc/adi,ad7124.yaml
 
+ANALOG DEVICES INC AD7192 DRIVER
+M:     Alexandru Tachici <alexandru.tachici@analog.com>
+L:     linux-iio@vger.kernel.org
+W:     http://ez.analog.com/community/linux-device-drivers
+S:     Supported
+F:     drivers/iio/adc/ad7192.c
+F:     Documentation/devicetree/bindings/iio/adc/adi,ad7192.yaml
+
 ANALOG DEVICES INC AD7292 DRIVER
 M:     Marcelo Schmitt <marcelo.schmitt1@gmail.com>
 L:     linux-iio@vger.kernel.org

diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
index 82e33082958cc9780d3b43a3b73249a33be51be4..f4da821c402244c09e5a72a273a8956607dca970 100644 (file)
--- a/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@ -39,6 +39,18 @@ config AD7124
          To compile this driver as a module, choose M here: the module will be
          called ad7124.
 
+config AD7192
+       tristate "Analog Devices AD7190 AD7192 AD7193 AD7195 ADC driver"
+       depends on SPI
+       select AD_SIGMA_DELTA
+       help
+         Say yes here to build support for Analog Devices AD7190,
+         AD7192, AD7193 or AD7195 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 ad7192.
+
 config AD7266
        tristate "Analog Devices AD7265/AD7266 ADC driver"
        depends on SPI_MASTER

diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile
index 919228900df963f31968e3530d2a734bf823f118..8462455b42283c6bcc130d3b7aafb5035b89f99d 100644 (file)
--- a/drivers/iio/adc/Makefile
+++ b/drivers/iio/adc/Makefile
@@ -8,6 +8,7 @@ obj-$(CONFIG_AB8500_GPADC) += ab8500-gpadc.o
 obj-$(CONFIG_AD_SIGMA_DELTA) += ad_sigma_delta.o
 obj-$(CONFIG_AD7091R5) += ad7091r5.o ad7091r-base.o
 obj-$(CONFIG_AD7124) += ad7124.o
+obj-$(CONFIG_AD7192) += ad7192.o
 obj-$(CONFIG_AD7266) += ad7266.o
 obj-$(CONFIG_AD7291) += ad7291.o
 obj-$(CONFIG_AD7292) += ad7292.o

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

diff --git a/drivers/staging/iio/adc/Kconfig b/drivers/staging/iio/adc/Kconfig
index 31cd9a12f40fb19ac3964781c720d9a7b7212c0a..b25f41053facc5b7045b2246409029fe8b133bde 100644 (file)
--- a/drivers/staging/iio/adc/Kconfig
+++ b/drivers/staging/iio/adc/Kconfig
@@ -15,18 +15,6 @@ config AD7816
          To compile this driver as a module, choose M here: the
          module will be called ad7816.
 
-config AD7192
-       tristate "Analog Devices AD7190 AD7192 AD7193 AD7195 ADC driver"
-       depends on SPI
-       select AD_SIGMA_DELTA
-       help
-         Say yes here to build support for Analog Devices AD7190,
-         AD7192, AD7193 or AD7195 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 ad7192.
-
 config AD7280
        tristate "Analog Devices AD7280A Lithium Ion Battery Monitoring System"
        depends on SPI

diff --git a/drivers/staging/iio/adc/Makefile b/drivers/staging/iio/adc/Makefile
index 4b76769b32bc51ee98e32e0aa5e20e7210b15795..6436a62b6278ff465ad455358d7e210e196b070f 100644 (file)
--- a/drivers/staging/iio/adc/Makefile
+++ b/drivers/staging/iio/adc/Makefile
@@ -4,5 +4,4 @@
 #
 
 obj-$(CONFIG_AD7816) += ad7816.o
-obj-$(CONFIG_AD7192) += ad7192.o
 obj-$(CONFIG_AD7280) += ad7280a.o