Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 105c3de1 authored Apr 24, 2017 by Brian Masney Committed by Jonathan Cameron Apr 26, 2017

staging: iio: isl29028: move out of staging



Move ISL29028 ALS / Proximity Sensor out of staging and into mainline.

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

parent e4ff6c1b

drivers/iio/light/Kconfig

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -172,6 +172,16 @@ config SENSORS_ISL29018
	in lux, proximity infrared sensing and normal infrared sensing.		in lux, proximity infrared sensing and normal infrared sensing.
	Data from sensor is accessible via sysfs.		Data from sensor is accessible via sysfs.

			config SENSORS_ISL29028
			tristate "Intersil ISL29028 Concurrent Light and Proximity Sensor"
			depends on I2C
			select REGMAP_I2C
			help
			Provides driver for the Intersil's ISL29028 device.
			This driver supports the sysfs interface to get the ALS, IR intensity,
			Proximity value via iio. The ISL29028 provides the concurrent sensing
			of ambient light and proximity.

	config ISL29125		config ISL29125
	tristate "Intersil ISL29125 digital color light sensor"		tristate "Intersil ISL29125 digital color light sensor"
	depends on I2C		depends on I2C

drivers/iio/light/Makefile

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -20,6 +20,7 @@ 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_SENSORS_ISL29018) += isl29018.o
			obj-$(CONFIG_SENSORS_ISL29028) += isl29028.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

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

+0 −0

File moved.

drivers/staging/iio/light/Kconfig

+0 −10

Original line number	Original line	Diff line number	Diff line
	@@ -3,16 +3,6 @@
	#		#
	menu "Light sensors"		menu "Light sensors"

	config SENSORS_ISL29028
	tristate "Intersil ISL29028 Concurrent Light and Proximity Sensor"
	depends on I2C
	select REGMAP_I2C
	help
	Provides driver for the Intersil's ISL29028 device.
	This driver supports the sysfs interface to get the ALS, IR intensity,
	Proximity value via iio. The ISL29028 provides the concurrent sensing
	of ambient light and proximity.

	config TSL2x7x		config TSL2x7x
	tristate "TAOS TSL/TMD2x71 and TSL/TMD2x72 Family of light and proximity sensors"		tristate "TAOS TSL/TMD2x71 and TSL/TMD2x72 Family of light and proximity sensors"
	depends on I2C		depends on I2C

drivers/staging/iio/light/Makefile

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2,5 +2,4 @@
	# Makefile for industrial I/O Light sensors		# Makefile for industrial I/O Light sensors
	#		#

	obj-$(CONFIG_SENSORS_ISL29028) += isl29028.o
	obj-$(CONFIG_TSL2x7x) += tsl2x7x_core.o		obj-$(CONFIG_TSL2x7x) += tsl2x7x_core.o