---

yaml --- r: 249189 b: refs/heads/master c: ac4f6ee h: refs/heads/master i: 249187: 787b774 v: v3
git-mirror · Apr 26, 2011 · 5af6545 · 5af6545
1 parent a936c06
commit 5af6545
Show file tree

Hide file tree

Showing 7 changed files with 1,007 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 69d900a69567b2cc217412e894a2c03218d23beb
+refs/heads/master: ac4f6eee8fe8f9f9bbd421d1c9a3ec9a0a6daa0b
diff --git a/trunk/drivers/staging/iio/Documentation/sysfs-bus-iio b/trunk/drivers/staging/iio/Documentation/sysfs-bus-iio
@@ -6,6 +6,12 @@ Description:
 		Corresponds to a grouping of sensor channels. X is the IIO
 		index of the device.
 
+What:		/sys/bus/iio/devices/device[n]/power_state
+KernelVersion:	2.6.37
+Contact:	linux-iio@vger.kernel.org
+Description:
+		This property gets/sets the device power state.
+
 What:		/sys/bus/iio/devices/triggerX
 KernelVersion:	2.6.35
 Contact:	linux-iio@vger.kernel.org

diff --git a/trunk/drivers/staging/iio/Documentation/sysfs-bus-iio-light b/trunk/drivers/staging/iio/Documentation/sysfs-bus-iio-light
@@ -62,3 +62,16 @@ Description:
 		sensing mode. This value should be the output from a reading
 		and if expressed in SI units, should include _input. If this
 		value is not in SI units, then it should include _raw.
+
+What:		/sys/bus/iio/devices/device[n]/illuminance0_target
+KernelVersion:	2.6.37
+Contact:	linux-iio@vger.kernel.org
+Description:
+		This property gets/sets the last known external
+		lux measurement used in/for calibration.
+
+What:		/sys/bus/iio/devices/device[n]/illuminance0_integration_time
+KernelVersion:	2.6.37
+Contact:	linux-iio@vger.kernel.org
+Description:
+		This property gets/sets the sensors ADC analog integration time.
diff --git a/trunk/drivers/staging/iio/Documentation/sysfs-bus-iio-light-tsl2583 b/trunk/drivers/staging/iio/Documentation/sysfs-bus-iio-light-tsl2583
@@ -0,0 +1,20 @@
+What:		/sys/bus/iio/devices/device[n]/lux_table
+KernelVersion:	2.6.37
+Contact:	linux-iio@vger.kernel.org
+Description:
+		This property gets/sets the table of coefficients
+		used in calculating illuminance in lux.
+
+What:		/sys/bus/iio/devices/device[n]/illuminance0_calibrate
+KernelVersion:	2.6.37
+Contact:	linux-iio@vger.kernel.org
+Description:
+		This property causes an internal calibration of the als gain trim
+		value which is later used in calculating illuminance in lux.
+
+What:		/sys/bus/iio/devices/device[n]/illuminance0_input_target
+KernelVersion:	2.6.37
+Contact:	linux-iio@vger.kernel.org
+Description:
+		This property is the known externally illuminance (in lux).
+		It is used in the process of calibrating the device accuracy.
diff --git a/trunk/drivers/staging/iio/light/Kconfig b/trunk/drivers/staging/iio/light/Kconfig
@@ -24,3 +24,9 @@ config SENSORS_ISL29018
          in lux, proximity infrared sensing and normal infrared sensing.
          Data from sensor is accessible via sysfs.
 
+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.
diff --git a/trunk/drivers/staging/iio/light/Makefile b/trunk/drivers/staging/iio/light/Makefile
@@ -4,3 +4,4 @@
 
 obj-$(CONFIG_SENSORS_TSL2563)	+= tsl2563.o
 obj-$(CONFIG_SENSORS_ISL29018)	+= isl29018.o
+obj-$(CONFIG_TSL2583)	+= tsl2583.o
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,3 +4,4 @@

		obj-$(CONFIG_SENSORS_TSL2563) += tsl2563.o
		obj-$(CONFIG_SENSORS_ISL29018) += isl29018.o
		obj-$(CONFIG_TSL2583) += tsl2583.o