staging: iio: ad2s1200: Move driver out of staging

Move the iio driver for the ad2s1200 and ad2s1205 resolver-to-digital
converter out of staging, into mainline iio subsystems.

Signed-off-by: David Veenstra <davidjulianveenstra@gmail.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/Kconfig b/drivers/iio/Kconfig
index d69e85a..d08aeb4 100644 (file)
--- a/drivers/iio/Kconfig
+++ b/drivers/iio/Kconfig
@@ -93,6 +93,7 @@ source "drivers/iio/potentiometer/Kconfig"
 source "drivers/iio/potentiostat/Kconfig"
 source "drivers/iio/pressure/Kconfig"
 source "drivers/iio/proximity/Kconfig"
+source "drivers/iio/resolver/Kconfig"
 source "drivers/iio/temperature/Kconfig"
 
 endif # IIO

diff --git a/drivers/iio/Makefile b/drivers/iio/Makefile
index d8cba9c..cb59932 100644 (file)
--- a/drivers/iio/Makefile
+++ b/drivers/iio/Makefile
@@ -36,5 +36,6 @@ obj-y += potentiometer/
 obj-y += potentiostat/
 obj-y += pressure/
 obj-y += proximity/
+obj-y += resolver/
 obj-y += temperature/
 obj-y += trigger/

diff --git a/drivers/iio/resolver/Kconfig b/drivers/iio/resolver/Kconfig
new file mode 100644 (file)
index 0000000..2ced9f2
--- /dev/null
+++ b/drivers/iio/resolver/Kconfig
@@ -0,0 +1,17 @@
+#
+# Resolver/Synchro drivers
+#
+menu "Resolver to digital converters"
+
+config AD2S1200
+       tristate "Analog Devices ad2s1200/ad2s1205 driver"
+       depends on SPI
+       depends on GPIOLIB || COMPILE_TEST
+       help
+         Say yes here to build support for Analog Devices spi resolver
+         to digital converters, ad2s1200 and ad2s1205, provides direct access
+         via sysfs.
+
+         To compile this driver as a module, choose M here: the
+         module will be called ad2s1200.
+endmenu

diff --git a/drivers/iio/resolver/Makefile b/drivers/iio/resolver/Makefile
new file mode 100644 (file)
index 0000000..4e1dcca
--- /dev/null
+++ b/drivers/iio/resolver/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for Resolver/Synchro drivers
+#
+
+obj-$(CONFIG_AD2S1200) += ad2s1200.o

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

diff --git a/drivers/staging/iio/resolver/Kconfig b/drivers/staging/iio/resolver/Kconfig
index 1c7e286..6a469ee 100644 (file)
--- a/drivers/staging/iio/resolver/Kconfig
+++ b/drivers/staging/iio/resolver/Kconfig
@@ -13,18 +13,6 @@ config AD2S90
          To compile this driver as a module, choose M here: the
          module will be called ad2s90.
 
-config AD2S1200
-       tristate "Analog Devices ad2s1200/ad2s1205 driver"
-       depends on SPI
-       depends on GPIOLIB || COMPILE_TEST
-       help
-         Say yes here to build support for Analog Devices spi resolver
-         to digital converters, ad2s1200 and ad2s1205, provides direct access
-         via sysfs.
-
-         To compile this driver as a module, choose M here: the
-         module will be called ad2s1200.
-
 config AD2S1210
        tristate "Analog Devices ad2s1210 driver"
        depends on SPI

diff --git a/drivers/staging/iio/resolver/Makefile b/drivers/staging/iio/resolver/Makefile
index 14375e4..8d901dc 100644 (file)
--- a/drivers/staging/iio/resolver/Makefile
+++ b/drivers/staging/iio/resolver/Makefile
@@ -3,5 +3,4 @@
 #
 
 obj-$(CONFIG_AD2S90) += ad2s90.o
-obj-$(CONFIG_AD2S1200) += ad2s1200.o
 obj-$(CONFIG_AD2S1210) += ad2s1210.o