staging: iio: isl29018: move out of staging

Move ISL29018/ISL29023/ISL29035 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/iio/light/Kconfig b/drivers/iio/light/Kconfig
index ba2e64d7ee58d242f46ffb9e4c4cb8bbcb9b5ab0..d0117208982829cce54e82dc7a9832a12df101e2 100644 (file)
--- a/drivers/iio/light/Kconfig
+++ b/drivers/iio/light/Kconfig
@@ -140,6 +140,18 @@ config GP2AP020A00F
          To compile this driver as a module, choose M here: the
          module will be called gp2ap020a00f.
 
+config SENSORS_ISL29018
+       tristate "Intersil 29018 light and proximity sensor"
+       depends on I2C
+       select REGMAP_I2C
+       default n
+       help
+        If you say yes here you get support for ambient light sensing and
+        proximity infrared sensing from Intersil ISL29018.
+        This driver will provide the measurements of ambient light intensity
+        in lux, proximity infrared sensing and normal infrared sensing.
+        Data from sensor is accessible via sysfs.
+
 config ISL29125
        tristate "Intersil ISL29125 digital color light sensor"
        depends on I2C

diff --git a/drivers/iio/light/Makefile b/drivers/iio/light/Makefile
index c5768df87a17fedc50121d02f33c65a1e9deb516..15f24c557f5f28e9c3c7dd0fe164995c86c09cb0 100644 (file)
--- a/drivers/iio/light/Makefile
+++ b/drivers/iio/light/Makefile
@@ -17,6 +17,7 @@ obj-$(CONFIG_CM36651)         += cm36651.o
 obj-$(CONFIG_GP2AP020A00F)     += gp2ap020a00f.o
 obj-$(CONFIG_HID_SENSOR_ALS)   += hid-sensor-als.o
 obj-$(CONFIG_HID_SENSOR_PROX)  += hid-sensor-prox.o
+obj-$(CONFIG_SENSORS_ISL29018) += isl29018.o
 obj-$(CONFIG_ISL29125)         += isl29125.o
 obj-$(CONFIG_JSA1212)          += jsa1212.o
 obj-$(CONFIG_SENSORS_LM3533)   += lm3533-als.o

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

diff --git a/drivers/staging/iio/light/Kconfig b/drivers/staging/iio/light/Kconfig
index 5e4e77ef7f98eb9c825ec82c7e1a01f98383ea44..dbf22d396ddf8dbef5f9c5f4eda0b5694875124c 100644 (file)
--- a/drivers/staging/iio/light/Kconfig
+++ b/drivers/staging/iio/light/Kconfig
@@ -3,18 +3,6 @@
 #
 menu "Light sensors"
 
-config SENSORS_ISL29018
-       tristate "Intersil 29018 light and proximity sensor"
-       depends on I2C
-       select REGMAP_I2C
-       default n
-       help
-        If you say yes here you get support for ambient light sensing and
-        proximity infrared sensing from Intersil ISL29018.
-        This driver will provide the measurements of ambient light intensity
-        in lux, proximity infrared sensing and normal infrared sensing.
-        Data from sensor is accessible via sysfs.
-
 config SENSORS_ISL29028
        tristate "Intersil ISL29028 Concurrent Light and Proximity Sensor"
        depends on I2C

diff --git a/drivers/staging/iio/light/Makefile b/drivers/staging/iio/light/Makefile
index 9960fdf7c15b5b9746bd233c04971d43d22b5264..6480856e168299a93fa3bd4b9b32586f160f1e8b 100644 (file)
--- a/drivers/staging/iio/light/Makefile
+++ b/drivers/staging/iio/light/Makefile
@@ -2,7 +2,6 @@
 # Makefile for industrial I/O Light sensors
 #
 
-obj-$(CONFIG_SENSORS_ISL29018) += isl29018.o
 obj-$(CONFIG_SENSORS_ISL29028) += isl29028.o
 obj-$(CONFIG_TSL2583)  += tsl2583.o
 obj-$(CONFIG_TSL2x7x)  += tsl2x7x_core.o