staging: iio: isl29028: move out of staging

Move ISL29028 ALS / Proximity Sensor out of staging and 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 33e755d8d825cee5b9884e4d3f3a8cbcdce25825..2356ed9285df6c5796a114083f188b6a8c072267 100644 (file)
--- a/drivers/iio/light/Kconfig
+++ b/drivers/iio/light/Kconfig
@@ -172,6 +172,16 @@ config SENSORS_ISL29018
         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
+       select REGMAP_I2C
+       help
+        Provides driver for the Intersil's ISL29028 device.
+        This driver supports the sysfs interface to get the ALS, IR intensity,
+        Proximity value via iio. The ISL29028 provides the concurrent sensing
+        of ambient light and proximity.
+
 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 681363c2b2983daf80c1097bdbb0a68543315f55..fa32fa459e2e4164943141c4fc427c66e0283b67 100644 (file)
--- a/drivers/iio/light/Makefile
+++ b/drivers/iio/light/Makefile
@@ -20,6 +20,7 @@ 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_SENSORS_ISL29028) += isl29028.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/isl29028.c b/drivers/iio/light/isl29028.c
similarity index 100%
rename from drivers/staging/iio/light/isl29028.c
rename to drivers/iio/light/isl29028.c

diff --git a/drivers/staging/iio/light/Kconfig b/drivers/staging/iio/light/Kconfig
index 4fbf6298c0f34e1011483df5ec24ccbad9bc1db9..aacb0ae58c0ef6097b40a7afd2e463a450bcd661 100644 (file)
--- a/drivers/staging/iio/light/Kconfig
+++ b/drivers/staging/iio/light/Kconfig
@@ -3,16 +3,6 @@
 #
 menu "Light sensors"
 
-config SENSORS_ISL29028
-       tristate "Intersil ISL29028 Concurrent Light and Proximity Sensor"
-       depends on I2C
-       select REGMAP_I2C
-       help
-        Provides driver for the Intersil's ISL29028 device.
-        This driver supports the sysfs interface to get the ALS, IR intensity,
-        Proximity value via iio. The ISL29028 provides the concurrent sensing
-        of ambient light and proximity.
-
 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 f8693e9fdc94437843f2593066440c43564e5896..10286c3ee6fef3d5f0492464f3ba61e2a6dbc13a 100644 (file)
--- a/drivers/staging/iio/light/Makefile
+++ b/drivers/staging/iio/light/Makefile
@@ -2,5 +2,4 @@
 # Makefile for industrial I/O Light sensors
 #
 
-obj-$(CONFIG_SENSORS_ISL29028) += isl29028.o
 obj-$(CONFIG_TSL2x7x)  += tsl2x7x_core.o