Commit a5750414 authored by Brian Masney's avatar Brian Masney Committed by Jonathan Cameron

staging: iio: isl29018: move out of staging

Move ISL29018/ISL29023/ISL29035 driver out of staging into mainline.
Signed-off-by: default avatarBrian Masney <masneyb@onstation.org>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent af06437d
...@@ -140,6 +140,18 @@ config GP2AP020A00F ...@@ -140,6 +140,18 @@ config GP2AP020A00F
To compile this driver as a module, choose M here: the To compile this driver as a module, choose M here: the
module will be called gp2ap020a00f. module will be called gp2ap020a00f.
config SENSORS_ISL29018
tristate "Intersil 29018 light and proximity sensor"
depends on I2C
select REGMAP_I2C
default n
help
If you say yes here you get support for ambient light sensing and
proximity infrared sensing from Intersil ISL29018.
This driver will provide the measurements of ambient light intensity
in lux, proximity infrared sensing and normal infrared sensing.
Data from sensor is accessible via sysfs.
config ISL29125 config ISL29125
tristate "Intersil ISL29125 digital color light sensor" tristate "Intersil ISL29125 digital color light sensor"
depends on I2C depends on I2C
......
...@@ -17,6 +17,7 @@ obj-$(CONFIG_CM36651) += cm36651.o ...@@ -17,6 +17,7 @@ obj-$(CONFIG_CM36651) += cm36651.o
obj-$(CONFIG_GP2AP020A00F) += gp2ap020a00f.o obj-$(CONFIG_GP2AP020A00F) += gp2ap020a00f.o
obj-$(CONFIG_HID_SENSOR_ALS) += hid-sensor-als.o obj-$(CONFIG_HID_SENSOR_ALS) += hid-sensor-als.o
obj-$(CONFIG_HID_SENSOR_PROX) += hid-sensor-prox.o obj-$(CONFIG_HID_SENSOR_PROX) += hid-sensor-prox.o
obj-$(CONFIG_SENSORS_ISL29018) += isl29018.o
obj-$(CONFIG_ISL29125) += isl29125.o obj-$(CONFIG_ISL29125) += isl29125.o
obj-$(CONFIG_JSA1212) += jsa1212.o obj-$(CONFIG_JSA1212) += jsa1212.o
obj-$(CONFIG_SENSORS_LM3533) += lm3533-als.o obj-$(CONFIG_SENSORS_LM3533) += lm3533-als.o
......
...@@ -3,18 +3,6 @@ ...@@ -3,18 +3,6 @@
# #
menu "Light sensors" menu "Light sensors"
config SENSORS_ISL29018
tristate "Intersil 29018 light and proximity sensor"
depends on I2C
select REGMAP_I2C
default n
help
If you say yes here you get support for ambient light sensing and
proximity infrared sensing from Intersil ISL29018.
This driver will provide the measurements of ambient light intensity
in lux, proximity infrared sensing and normal infrared sensing.
Data from sensor is accessible via sysfs.
config SENSORS_ISL29028 config SENSORS_ISL29028
tristate "Intersil ISL29028 Concurrent Light and Proximity Sensor" tristate "Intersil ISL29028 Concurrent Light and Proximity Sensor"
depends on I2C depends on I2C
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
# Makefile for industrial I/O Light sensors # Makefile for industrial I/O Light sensors
# #
obj-$(CONFIG_SENSORS_ISL29018) += isl29018.o
obj-$(CONFIG_SENSORS_ISL29028) += isl29028.o obj-$(CONFIG_SENSORS_ISL29028) += isl29028.o
obj-$(CONFIG_TSL2583) += tsl2583.o obj-$(CONFIG_TSL2583) += tsl2583.o
obj-$(CONFIG_TSL2x7x) += tsl2x7x_core.o obj-$(CONFIG_TSL2x7x) += tsl2x7x_core.o
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment