diff options
| author | Brian Masney <masneyb@onstation.org> | 2016-11-12 19:19:41 +0100 |
|---|---|---|
| committer | Jonathan Cameron <jic23@kernel.org> | 2016-11-13 14:07:33 +0100 |
| commit | f44d5c8ac3993421370fc00951abd5864ca71689 (patch) | |
| tree | 9590c770078890402b1b6aedf0d96ac1068dd287 | |
| parent | staging: iio: tsl2583: add copyright and MODULE_AUTHOR (diff) | |
| download | linux-f44d5c8ac3993421370fc00951abd5864ca71689.tar.xz linux-f44d5c8ac3993421370fc00951abd5864ca71689.zip | |
staging: iio: tsl2583: move out of staging
Move tsl2580, tsl2581, tsl2583 driver out of staging into mainline.
Signed-off-by: Brian Masney <masneyb@onstation.org>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| -rw-r--r-- | Documentation/ABI/testing/sysfs-bus-iio-light-tsl2583 (renamed from drivers/staging/iio/Documentation/light/sysfs-bus-iio-light-tsl2583) | 0 | ||||
| -rw-r--r-- | drivers/iio/light/Kconfig | 7 | ||||
| -rw-r--r-- | drivers/iio/light/Makefile | 1 | ||||
| -rw-r--r-- | drivers/iio/light/tsl2583.c (renamed from drivers/staging/iio/light/tsl2583.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/iio/light/Kconfig | 7 | ||||
| -rw-r--r-- | drivers/staging/iio/light/Makefile | 1 |
6 files changed, 8 insertions, 8 deletions
diff --git a/drivers/staging/iio/Documentation/light/sysfs-bus-iio-light-tsl2583 b/Documentation/ABI/testing/sysfs-bus-iio-light-tsl2583 index a2e19964e87e..a2e19964e87e 100644 --- a/drivers/staging/iio/Documentation/light/sysfs-bus-iio-light-tsl2583 +++ b/Documentation/ABI/testing/sysfs-bus-iio-light-tsl2583 diff --git a/drivers/iio/light/Kconfig b/drivers/iio/light/Kconfig index d01172089828..298ea5081a96 100644 --- a/drivers/iio/light/Kconfig +++ b/drivers/iio/light/Kconfig @@ -338,6 +338,13 @@ config SENSORS_TSL2563 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 + help + Provides support for the TAOS tsl2580, tsl2581 and tsl2583 devices. + Access ALS data via iio, sysfs. + config TSL4531 tristate "TAOS TSL4531 ambient light sensors" depends on I2C diff --git a/drivers/iio/light/Makefile b/drivers/iio/light/Makefile index 15f24c557f5f..4de520036e6e 100644 --- a/drivers/iio/light/Makefile +++ b/drivers/iio/light/Makefile @@ -31,6 +31,7 @@ obj-$(CONFIG_SI1145) += si1145.o obj-$(CONFIG_STK3310) += stk3310.o obj-$(CONFIG_TCS3414) += tcs3414.o obj-$(CONFIG_TCS3472) += tcs3472.o +obj-$(CONFIG_TSL2583) += tsl2583.o obj-$(CONFIG_TSL4531) += tsl4531.o obj-$(CONFIG_US5182D) += us5182d.o obj-$(CONFIG_VCNL4000) += vcnl4000.o diff --git a/drivers/staging/iio/light/tsl2583.c b/drivers/iio/light/tsl2583.c index 0b87f6adbb79..0b87f6adbb79 100644 --- a/drivers/staging/iio/light/tsl2583.c +++ b/drivers/iio/light/tsl2583.c diff --git a/drivers/staging/iio/light/Kconfig b/drivers/staging/iio/light/Kconfig index dbf22d396ddf..4fbf6298c0f3 100644 --- a/drivers/staging/iio/light/Kconfig +++ b/drivers/staging/iio/light/Kconfig @@ -13,13 +13,6 @@ config SENSORS_ISL29028 Proximity value via iio. The ISL29028 provides the concurrent sensing of ambient light and proximity. -config TSL2583 - tristate "TAOS TSL2580, TSL2581 and TSL2583 light-to-digital converters" - depends on I2C - help - Provides support for the TAOS tsl2580, tsl2581 and tsl2583 devices. - Access ALS data via iio, sysfs. - config TSL2x7x tristate "TAOS TSL/TMD2x71 and TSL/TMD2x72 Family of light and proximity sensors" depends on I2C diff --git a/drivers/staging/iio/light/Makefile b/drivers/staging/iio/light/Makefile index 6480856e1682..f8693e9fdc94 100644 --- a/drivers/staging/iio/light/Makefile +++ b/drivers/staging/iio/light/Makefile @@ -3,5 +3,4 @@ # obj-$(CONFIG_SENSORS_ISL29028) += isl29028.o -obj-$(CONFIG_TSL2583) += tsl2583.o obj-$(CONFIG_TSL2x7x) += tsl2x7x_core.o |