diff options
author | Jonathan Cameron <jic23@kernel.org> | 2013-01-12 14:35:00 +0400 |
---|---|---|
committer | Jonathan Cameron <jic23@kernel.org> | 2013-01-27 21:37:24 +0400 |
commit | 9c2251dd4b7feba14d35835c6835024840b1f76b (patch) | |
tree | 5f0ce5da5d55d02379f23b9eff0314f7cb595c38 | |
parent | af0b8ee32c831e6e8fbfe0b311b9ac017d14b78d (diff) | |
download | linux-9c2251dd4b7feba14d35835c6835024840b1f76b.tar.xz |
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>
-rw-r--r-- | arch/arm/mach-omap2/board-rx51-peripherals.c | 2 | ||||
-rw-r--r-- | drivers/iio/light/Kconfig | 10 | ||||
-rw-r--r-- | drivers/iio/light/Makefile | 1 | ||||
-rw-r--r-- | drivers/iio/light/tsl2563.c (renamed from drivers/staging/iio/light/tsl2563.c) | 4 | ||||
-rw-r--r-- | drivers/staging/iio/light/Kconfig | 10 | ||||
-rw-r--r-- | drivers/staging/iio/light/Makefile | 1 | ||||
-rw-r--r-- | include/linux/platform_data/tsl2563.h (renamed from drivers/staging/iio/light/tsl2563.h) | 1 |
7 files changed, 14 insertions, 15 deletions
diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c index cf07e289b4ea..f3d075baebb6 100644 --- a/arch/arm/mach-omap2/board-rx51-peripherals.c +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c @@ -42,7 +42,7 @@ #include <media/si4713.h> #include <linux/leds-lp5523.h> -#include <../drivers/staging/iio/light/tsl2563.h> +#include <linux/platform_data/tsl2563.h> #include <linux/lis3lv02d.h> #if defined(CONFIG_IR_RX51) || defined(CONFIG_IR_RX51_MODULE) diff --git a/drivers/iio/light/Kconfig b/drivers/iio/light/Kconfig index dbf80abc834f..5ef1a396e0c9 100644 --- a/drivers/iio/light/Kconfig +++ b/drivers/iio/light/Kconfig @@ -32,6 +32,16 @@ config SENSORS_LM3533 changes. The ALS-control output values can be set per zone for the 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 tristate "VCNL4000 combined ALS and proximity sensor" depends on I2C diff --git a/drivers/iio/light/Makefile b/drivers/iio/light/Makefile index 21a8f0df1407..040d9c75f8e6 100644 --- a/drivers/iio/light/Makefile +++ b/drivers/iio/light/Makefile @@ -4,5 +4,6 @@ obj-$(CONFIG_ADJD_S311) += adjd_s311.o obj-$(CONFIG_SENSORS_LM3533) += lm3533-als.o +obj-$(CONFIG_SENSORS_TSL2563) += tsl2563.o obj-$(CONFIG_VCNL4000) += vcnl4000.o obj-$(CONFIG_HID_SENSOR_ALS) += hid-sensor-als.o diff --git a/drivers/staging/iio/light/tsl2563.c b/drivers/iio/light/tsl2563.c index b91d9bb8b083..fd8be69b7d05 100644 --- a/drivers/staging/iio/light/tsl2563.c +++ b/drivers/iio/light/tsl2563.c @@ -1,5 +1,5 @@ /* - * drivers/i2c/chips/tsl2563.c + * drivers/iio/light/tsl2563.c * * Copyright (C) 2008 Nokia Corporation * @@ -38,7 +38,7 @@ #include <linux/iio/iio.h> #include <linux/iio/sysfs.h> #include <linux/iio/events.h> -#include "tsl2563.h" +#include <linux/platform_data/tsl2563.h> /* Use this many bits for fraction part. */ #define ADC_FRAC_BITS 14 diff --git a/drivers/staging/iio/light/Kconfig b/drivers/staging/iio/light/Kconfig index 4bed30eac3ed..ca8d6e66c899 100644 --- a/drivers/staging/iio/light/Kconfig +++ b/drivers/staging/iio/light/Kconfig @@ -25,16 +25,6 @@ config SENSORS_ISL29028 Proximity value via iio. The ISL29028 provides the concurrent sensing 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 tristate "TAOS TSL2580, TSL2581 and TSL2583 light-to-digital converters" depends on I2C diff --git a/drivers/staging/iio/light/Makefile b/drivers/staging/iio/light/Makefile index 141af1eb164c..9960fdf7c15b 100644 --- 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_TSL2563) += tsl2563.o obj-$(CONFIG_SENSORS_ISL29018) += isl29018.o obj-$(CONFIG_SENSORS_ISL29028) += isl29028.o obj-$(CONFIG_TSL2583) += tsl2583.o diff --git a/drivers/staging/iio/light/tsl2563.h b/include/linux/platform_data/tsl2563.h index b97368bd7fff..c90d7a09dda7 100644 --- a/drivers/staging/iio/light/tsl2563.h +++ b/include/linux/platform_data/tsl2563.h @@ -6,4 +6,3 @@ struct tsl2563_platform_data { }; #endif /* __LINUX_TSL2563_H */ - |