staging: iio: tsl2583: move out of staging

Move tsl2580, tsl2581, tsl2583 driver out of staging into mainline.

Signed-off-by: Brian Masney <masneyb@onstation.org>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>

diff --git a/drivers/staging/iio/Documentation/light/sysfs-bus-iio-light-tsl2583 b/Documentation/ABI/testing/sysfs-bus-iio-light-tsl2583
similarity index 100%
rename from drivers/staging/iio/Documentation/light/sysfs-bus-iio-light-tsl2583
rename to Documentation/ABI/testing/sysfs-bus-iio-light-tsl2583

diff --git a/drivers/iio/light/Kconfig b/drivers/iio/light/Kconfig
index d0117208982829cce54e82dc7a9832a12df101e2..298ea5081a96c6217c77f7fea2517a29d1907af7 100644 (file)
--- a/drivers/iio/light/Kconfig
+++ b/drivers/iio/light/Kconfig
@@ -338,6 +338,13 @@ config SENSORS_TSL2563
         This driver can also be built as a module.  If so, the module
         will be called tsl2563.
 
+config TSL2583
+       tristate "TAOS TSL2580, TSL2581 and TSL2583 light-to-digital converters"
+       depends on I2C
+       help
+        Provides support for the TAOS tsl2580, tsl2581 and tsl2583 devices.
+        Access ALS data via iio, sysfs.
+
 config TSL4531
        tristate "TAOS TSL4531 ambient light sensors"
        depends on I2C

diff --git a/drivers/iio/light/Makefile b/drivers/iio/light/Makefile
index 15f24c557f5f28e9c3c7dd0fe164995c86c09cb0..4de520036e6e0bfc9ea14c976270778f67d4c3ff 100644 (file)
--- a/drivers/iio/light/Makefile
+++ b/drivers/iio/light/Makefile
@@ -31,6 +31,7 @@ obj-$(CONFIG_SI1145)          += si1145.o
 obj-$(CONFIG_STK3310)          += stk3310.o
 obj-$(CONFIG_TCS3414)          += tcs3414.o
 obj-$(CONFIG_TCS3472)          += tcs3472.o
+obj-$(CONFIG_TSL2583)          += tsl2583.o
 obj-$(CONFIG_TSL4531)          += tsl4531.o
 obj-$(CONFIG_US5182D)          += us5182d.o
 obj-$(CONFIG_VCNL4000)         += vcnl4000.o

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

diff --git a/drivers/staging/iio/light/Kconfig b/drivers/staging/iio/light/Kconfig
index dbf22d396ddf8dbef5f9c5f4eda0b5694875124c..4fbf6298c0f34e1011483df5ec24ccbad9bc1db9 100644 (file)
--- a/drivers/staging/iio/light/Kconfig
+++ b/drivers/staging/iio/light/Kconfig
@@ -13,13 +13,6 @@ config SENSORS_ISL29028
         Proximity value via iio. The ISL29028 provides the concurrent sensing
         of ambient light and proximity.
 
-config TSL2583
-       tristate "TAOS TSL2580, TSL2581 and TSL2583 light-to-digital converters"
-       depends on I2C
-       help
-        Provides support for the TAOS tsl2580, tsl2581 and tsl2583 devices.
-        Access ALS data via iio, sysfs.
-
 config TSL2x7x
        tristate "TAOS TSL/TMD2x71 and TSL/TMD2x72 Family of light and proximity sensors"
        depends on I2C

diff --git a/drivers/staging/iio/light/Makefile b/drivers/staging/iio/light/Makefile
index 6480856e168299a93fa3bd4b9b32586f160f1e8b..f8693e9fdc94437843f2593066440c43564e5896 100644 (file)
--- a/drivers/staging/iio/light/Makefile
+++ b/drivers/staging/iio/light/Makefile
@@ -3,5 +3,4 @@
 #
 
 obj-$(CONFIG_SENSORS_ISL29028) += isl29028.o
-obj-$(CONFIG_TSL2583)  += tsl2583.o
 obj-$(CONFIG_TSL2x7x)  += tsl2x7x_core.o