Commit c06c4d79 authored by Brian Masney's avatar Brian Masney Committed by Jonathan Cameron
Browse files

staging: iio: tsl2x7x/tsl2772: move out of staging 



Move the tsl2772 driver out of staging and into mainline.

Signed-off-by: default avatarBrian Masney <masneyb@onstation.org>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 4e24c171

drivers/iio/light/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -409,6 +409,14 @@ config TSL2583 
	 Provides support for the TAOS tsl2580, tsl2581 and tsl2583 devices.

	 Access ALS data via iio, sysfs.



config TSL2772

	tristate "TAOS TSL/TMD2x71 and TSL/TMD2x72 Family of light and proximity sensors"

	depends on I2C

	help

	 Support for: tsl2571, tsl2671, tmd2671, tsl2771, tmd2771, tsl2572, tsl2672,

	 tmd2672, tsl2772, tmd2772 devices.

	 Provides iio_events and direct access via sysfs.



config TSL4531

	tristate "TAOS TSL4531 ambient light sensors"

	depends on I2C

drivers/iio/light/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ obj-$(CONFIG_ST_UVIS25_SPI) += st_uvis25_spi.o 
obj-$(CONFIG_TCS3414)		+= tcs3414.o

obj-$(CONFIG_TCS3472)		+= tcs3472.o

obj-$(CONFIG_TSL2583)		+= tsl2583.o

obj-$(CONFIG_TSL2772)		+= tsl2772.o

obj-$(CONFIG_TSL4531)		+= tsl4531.o

obj-$(CONFIG_US5182D)		+= us5182d.o

obj-$(CONFIG_VCNL4000)		+= vcnl4000.o

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

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include <linux/iio/events.h>

#include <linux/iio/iio.h>

#include <linux/iio/sysfs.h>

#include "tsl2772.h"

#include <linux/platform_data/tsl2772.h>



/* Cal defs */

#define PROX_STAT_CAL			0

drivers/staging/iio/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ source "drivers/staging/iio/cdc/Kconfig" 
source "drivers/staging/iio/frequency/Kconfig"

source "drivers/staging/iio/gyro/Kconfig"

source "drivers/staging/iio/impedance-analyzer/Kconfig"

source "drivers/staging/iio/light/Kconfig"

source "drivers/staging/iio/meter/Kconfig"

source "drivers/staging/iio/resolver/Kconfig"

drivers/staging/iio/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -10,6 +10,5 @@ obj-y += cdc/ 
obj-y += frequency/

obj-y += gyro/

obj-y += impedance-analyzer/

obj-y += light/

obj-y += meter/

obj-y += resolver/

CRA Git | Maintained and supported by SUSTech CRA and CCSE