Browse Source

iio:light:tsl2563 move out of staging

This driver is simple, uses the latest interfaces and contains few if
any controversial elements.  All of its interfaces have been in place
for a long time now.  Hence let's move it out of staging.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Acked-by: Peter Meerwald <pmeerw@pmeerw.net>
Jonathan Cameron 12 years ago
parent
commit
9c2251dd4b

+ 1 - 1
arch/arm/mach-omap2/board-rx51-peripherals.c

@@ -42,7 +42,7 @@
 #include <media/si4713.h>
 #include <media/si4713.h>
 #include <linux/leds-lp5523.h>
 #include <linux/leds-lp5523.h>
 
 
-#include <../drivers/staging/iio/light/tsl2563.h>
+#include <linux/platform_data/tsl2563.h>
 #include <linux/lis3lv02d.h>
 #include <linux/lis3lv02d.h>
 
 
 #if defined(CONFIG_IR_RX51) || defined(CONFIG_IR_RX51_MODULE)
 #if defined(CONFIG_IR_RX51) || defined(CONFIG_IR_RX51_MODULE)

+ 10 - 0
drivers/iio/light/Kconfig

@@ -32,6 +32,16 @@ config SENSORS_LM3533
 	  changes. The ALS-control output values can be set per zone for the
 	  changes. The ALS-control output values can be set per zone for the
 	  three current output channels.
 	  three current output channels.
 
 
+config SENSORS_TSL2563
+	tristate "TAOS TSL2560, TSL2561, TSL2562 and TSL2563 ambient light sensors"
+	depends on I2C
+	help
+	 If you say yes here you get support for the Taos TSL2560,
+	 TSL2561, TSL2562 and TSL2563 ambient light sensors.
+
+	 This driver can also be built as a module.  If so, the module
+	 will be called tsl2563.
+
 config VCNL4000
 config VCNL4000
 	tristate "VCNL4000 combined ALS and proximity sensor"
 	tristate "VCNL4000 combined ALS and proximity sensor"
 	depends on I2C
 	depends on I2C

+ 1 - 0
drivers/iio/light/Makefile

@@ -4,5 +4,6 @@
 
 
 obj-$(CONFIG_ADJD_S311)		+= adjd_s311.o
 obj-$(CONFIG_ADJD_S311)		+= adjd_s311.o
 obj-$(CONFIG_SENSORS_LM3533)	+= lm3533-als.o
 obj-$(CONFIG_SENSORS_LM3533)	+= lm3533-als.o
+obj-$(CONFIG_SENSORS_TSL2563)	+= tsl2563.o
 obj-$(CONFIG_VCNL4000)		+= vcnl4000.o
 obj-$(CONFIG_VCNL4000)		+= vcnl4000.o
 obj-$(CONFIG_HID_SENSOR_ALS)	+= hid-sensor-als.o
 obj-$(CONFIG_HID_SENSOR_ALS)	+= hid-sensor-als.o

+ 2 - 2
drivers/staging/iio/light/tsl2563.c → drivers/iio/light/tsl2563.c

@@ -1,5 +1,5 @@
 /*
 /*
- * drivers/i2c/chips/tsl2563.c
+ * drivers/iio/light/tsl2563.c
  *
  *
  * Copyright (C) 2008 Nokia Corporation
  * Copyright (C) 2008 Nokia Corporation
  *
  *
@@ -38,7 +38,7 @@
 #include <linux/iio/iio.h>
 #include <linux/iio/iio.h>
 #include <linux/iio/sysfs.h>
 #include <linux/iio/sysfs.h>
 #include <linux/iio/events.h>
 #include <linux/iio/events.h>
-#include "tsl2563.h"
+#include <linux/platform_data/tsl2563.h>
 
 
 /* Use this many bits for fraction part. */
 /* Use this many bits for fraction part. */
 #define ADC_FRAC_BITS		14
 #define ADC_FRAC_BITS		14

+ 0 - 10
drivers/staging/iio/light/Kconfig

@@ -25,16 +25,6 @@ config SENSORS_ISL29028
 	 Proximity value via iio. The ISL29028 provides the concurrent sensing
 	 Proximity value via iio. The ISL29028 provides the concurrent sensing
 	 of ambient light and proximity.
 	 of ambient light and proximity.
 
 
-config SENSORS_TSL2563
-	tristate "TAOS TSL2560, TSL2561, TSL2562 and TSL2563 ambient light sensors"
-	depends on I2C
-	help
-	 If you say yes here you get support for the Taos TSL2560,
-	 TSL2561, TSL2562 and TSL2563 ambient light sensors.
-
-	 This driver can also be built as a module.  If so, the module
-	 will be called tsl2563.
-
 config TSL2583
 config TSL2583
 	tristate "TAOS TSL2580, TSL2581 and TSL2583 light-to-digital converters"
 	tristate "TAOS TSL2580, TSL2581 and TSL2583 light-to-digital converters"
 	depends on I2C
 	depends on I2C

+ 0 - 1
drivers/staging/iio/light/Makefile

@@ -2,7 +2,6 @@
 # Makefile for industrial I/O Light sensors
 # Makefile for industrial I/O Light sensors
 #
 #
 
 
-obj-$(CONFIG_SENSORS_TSL2563)	+= tsl2563.o
 obj-$(CONFIG_SENSORS_ISL29018)	+= isl29018.o
 obj-$(CONFIG_SENSORS_ISL29018)	+= isl29018.o
 obj-$(CONFIG_SENSORS_ISL29028)	+= isl29028.o
 obj-$(CONFIG_SENSORS_ISL29028)	+= isl29028.o
 obj-$(CONFIG_TSL2583)	+= tsl2583.o
 obj-$(CONFIG_TSL2583)	+= tsl2583.o

+ 0 - 1
drivers/staging/iio/light/tsl2563.h → include/linux/platform_data/tsl2563.h

@@ -6,4 +6,3 @@ struct tsl2563_platform_data {
 };
 };
 
 
 #endif /* __LINUX_TSL2563_H */
 #endif /* __LINUX_TSL2563_H */
-