staging:iio:ad2s90: Move out of staging

Move ad2s90 resolver driver out of staging to the main tree.

Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br>
Signed-off-by: Victor Colombo <victorcolombo@gmail.com>
Acked-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/resolver/Kconfig b/drivers/iio/resolver/Kconfig
index 2ced9f22aa707ecb9301e68d4ccedea827461004..786801be54f62816fb9fefb872b3edc81f7bbc2b 100644 (file)
--- a/drivers/iio/resolver/Kconfig
+++ b/drivers/iio/resolver/Kconfig
@@ -3,6 +3,16 @@
 #
 menu "Resolver to digital converters"
 
+config AD2S90
+       tristate "Analog Devices ad2s90 driver"
+       depends on SPI
+       help
+         Say yes here to build support for Analog Devices spi resolver
+         to digital converters, ad2s90, provides direct access via sysfs.
+
+         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

diff --git a/drivers/iio/resolver/Makefile b/drivers/iio/resolver/Makefile
index 4e1dccae07e7ed0bfcdb1fe5a048358a13313b84..398d82d50028d5697346103c3eb8dcd1700423a7 100644 (file)
--- a/drivers/iio/resolver/Makefile
+++ b/drivers/iio/resolver/Makefile
@@ -2,4 +2,5 @@
 # Makefile for Resolver/Synchro drivers
 #
 
+obj-$(CONFIG_AD2S90) += ad2s90.o
 obj-$(CONFIG_AD2S1200) += ad2s1200.o

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

diff --git a/drivers/staging/iio/resolver/Kconfig b/drivers/staging/iio/resolver/Kconfig
index 6a469ee6101f88e878b26768946f23f633850791..4a727c17bb8faa155f076a788d99ef48fae2a8fc 100644 (file)
--- a/drivers/staging/iio/resolver/Kconfig
+++ b/drivers/staging/iio/resolver/Kconfig
@@ -3,16 +3,6 @@
 #
 menu "Resolver to digital converters"
 
-config AD2S90
-       tristate "Analog Devices ad2s90 driver"
-       depends on SPI
-       help
-         Say yes here to build support for Analog Devices spi resolver
-         to digital converters, ad2s90, provides direct access via sysfs.
-
-         To compile this driver as a module, choose M here: the
-         module will be called ad2s90.
-
 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 8d901dc7500bf47eec39ee416e1b45bf3f9611dd..b2049f2ce36e48f56ca2e430811319f5f134aa14 100644 (file)
--- a/drivers/staging/iio/resolver/Makefile
+++ b/drivers/staging/iio/resolver/Makefile
@@ -2,5 +2,4 @@
 # Makefile for Resolver/Synchro drivers
 #
 
-obj-$(CONFIG_AD2S90) += ad2s90.o
 obj-$(CONFIG_AD2S1210) += ad2s1210.o