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: isl29018: move out of staging

Move ISL29018/ISL29023/ISL29035 driver out of staging into mainline.

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

authored by

Brian Masney and committed by
Jonathan Cameron a5750414 af06437d

+13 -13
+12
drivers/iio/light/Kconfig
··· 140 140 To compile this driver as a module, choose M here: the 141 141 module will be called gp2ap020a00f. 142 142 143 + config SENSORS_ISL29018 144 + tristate "Intersil 29018 light and proximity sensor" 145 + depends on I2C 146 + select REGMAP_I2C 147 + default n 148 + help 149 + If you say yes here you get support for ambient light sensing and 150 + proximity infrared sensing from Intersil ISL29018. 151 + This driver will provide the measurements of ambient light intensity 152 + in lux, proximity infrared sensing and normal infrared sensing. 153 + Data from sensor is accessible via sysfs. 154 + 143 155 config ISL29125 144 156 tristate "Intersil ISL29125 digital color light sensor" 145 157 depends on I2C
+1
drivers/iio/light/Makefile
··· 17 17 obj-$(CONFIG_GP2AP020A00F) += gp2ap020a00f.o 18 18 obj-$(CONFIG_HID_SENSOR_ALS) += hid-sensor-als.o 19 19 obj-$(CONFIG_HID_SENSOR_PROX) += hid-sensor-prox.o 20 + obj-$(CONFIG_SENSORS_ISL29018) += isl29018.o 20 21 obj-$(CONFIG_ISL29125) += isl29125.o 21 22 obj-$(CONFIG_JSA1212) += jsa1212.o 22 23 obj-$(CONFIG_SENSORS_LM3533) += lm3533-als.o
-12
drivers/staging/iio/light/Kconfig
··· 3 3 # 4 4 menu "Light sensors" 5 5 6 - config SENSORS_ISL29018 7 - tristate "Intersil 29018 light and proximity sensor" 8 - depends on I2C 9 - select REGMAP_I2C 10 - default n 11 - help 12 - If you say yes here you get support for ambient light sensing and 13 - proximity infrared sensing from Intersil ISL29018. 14 - This driver will provide the measurements of ambient light intensity 15 - in lux, proximity infrared sensing and normal infrared sensing. 16 - Data from sensor is accessible via sysfs. 17 - 18 6 config SENSORS_ISL29028 19 7 tristate "Intersil ISL29028 Concurrent Light and Proximity Sensor" 20 8 depends on I2C
-1
drivers/staging/iio/light/Makefile
··· 2 2 # Makefile for industrial I/O Light sensors 3 3 # 4 4 5 - obj-$(CONFIG_SENSORS_ISL29018) += isl29018.o 6 5 obj-$(CONFIG_SENSORS_ISL29028) += isl29028.o 7 6 obj-$(CONFIG_TSL2583) += tsl2583.o 8 7 obj-$(CONFIG_TSL2x7x) += tsl2x7x_core.o
drivers/staging/iio/light/isl29018.c drivers/iio/light/isl29018.c