tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Move the tsl2772 driver out of staging and into mainline.

Signed-off-by: Brian Masney <masneyb@onstation.org>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

authored by

Brian Masney and committed by
Jonathan Cameron c06c4d79 4e24c171

+10 -22
+8
drivers/iio/light/Kconfig
··· 409 409 Provides support for the TAOS tsl2580, tsl2581 and tsl2583 devices. 410 410 Access ALS data via iio, sysfs. 411 411 412 + config TSL2772 413 + tristate "TAOS TSL/TMD2x71 and TSL/TMD2x72 Family of light and proximity sensors" 414 + depends on I2C 415 + help 416 + Support for: tsl2571, tsl2671, tmd2671, tsl2771, tmd2771, tsl2572, tsl2672, 417 + tmd2672, tsl2772, tmd2772 devices. 418 + Provides iio_events and direct access via sysfs. 419 + 412 420 config TSL4531 413 421 tristate "TAOS TSL4531 ambient light sensors" 414 422 depends on I2C
+1
drivers/iio/light/Makefile
··· 40 40 obj-$(CONFIG_TCS3414) += tcs3414.o 41 41 obj-$(CONFIG_TCS3472) += tcs3472.o 42 42 obj-$(CONFIG_TSL2583) += tsl2583.o 43 + obj-$(CONFIG_TSL2772) += tsl2772.o 43 44 obj-$(CONFIG_TSL4531) += tsl4531.o 44 45 obj-$(CONFIG_US5182D) += us5182d.o 45 46 obj-$(CONFIG_VCNL4000) += vcnl4000.o
-1
drivers/staging/iio/Kconfig
··· 11 11 source "drivers/staging/iio/frequency/Kconfig" 12 12 source "drivers/staging/iio/gyro/Kconfig" 13 13 source "drivers/staging/iio/impedance-analyzer/Kconfig" 14 - source "drivers/staging/iio/light/Kconfig" 15 14 source "drivers/staging/iio/meter/Kconfig" 16 15 source "drivers/staging/iio/resolver/Kconfig" 17 16
-1
drivers/staging/iio/Makefile
··· 10 10 obj-y += frequency/ 11 11 obj-y += gyro/ 12 12 obj-y += impedance-analyzer/ 13 - obj-y += light/ 14 13 obj-y += meter/ 15 14 obj-y += resolver/
-14
drivers/staging/iio/light/Kconfig
··· 1 - # 2 - # Light sensors 3 - # 4 - menu "Light sensors" 5 - 6 - config TSL2772 7 - tristate "TAOS TSL/TMD2x71 and TSL/TMD2x72 Family of light and proximity sensors" 8 - depends on I2C 9 - help 10 - Support for: tsl2571, tsl2671, tmd2671, tsl2771, tmd2771, tsl2572, tsl2672, 11 - tmd2672, tsl2772, tmd2772 devices. 12 - Provides iio_events and direct access via sysfs. 13 - 14 - endmenu
-5
drivers/staging/iio/light/Makefile
··· 1 - # 2 - # Makefile for industrial I/O Light sensors 3 - # 4 - 5 - obj-$(CONFIG_TSL2772) += tsl2772.o
+1 -1
drivers/staging/iio/light/tsl2772.c drivers/iio/light/tsl2772.c
··· 19 19 #include <linux/iio/events.h> 20 20 #include <linux/iio/iio.h> 21 21 #include <linux/iio/sysfs.h> 22 - #include "tsl2772.h" 22 + #include <linux/platform_data/tsl2772.h> 23 23 24 24 /* Cal defs */ 25 25 #define PROX_STAT_CAL 0
drivers/staging/iio/light/tsl2772.h include/linux/platform_data/tsl2772.h