Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c2251dd authored by Jonathan Cameron's avatar Jonathan Cameron
Browse files

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: default avatarJonathan Cameron <jic23@kernel.org>
Acked-by: default avatarPeter Meerwald <pmeerw@pmeerw.net>
parent af0b8ee3

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

+1 −1
Original line number Diff line number Diff line
@@ -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)

drivers/iio/light/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -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

drivers/iio/light/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -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

drivers/staging/iio/light/tsl2563.c→drivers/iio/light/tsl2563.c

+2 −2
Original line number Diff line number Diff line 
/*

 * 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

drivers/staging/iio/light/Kconfig

+0 −10
Original line number Diff line number Diff line
@@ -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