leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IIO channel type and modifiers for CCT and RGBC data

Browse Source 
Add iio channel type and modifiers for Correlated Color Temperature (CCT)
and RGBC (red/green/blue/clear) data.
Add CCT and RGBC descriptions to documentation.

Changes:
Revised/condensed RGBC descriptions.

Merge and trivial fix done by Jonathan Cameron.

Signed-off-by: Jon Brenner <jbrenner@taosinc.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
This commit is contained in:
Jon Brenner 2012-05-16 10:46:42 -05:00 committed by Jonathan Cameron
parent ee0312a05d
commit 21cd1fab05
3 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/iio/industrialio-core.c
View File

@ -64,6 +64,7 @@ static const char * const iio_chan_type_name_spec[] = {
[IIO_TIMESTAMP] = "timestamp",
[IIO_CAPACITANCE] = "capacitance",
[IIO_ALTVOLTAGE] = "altvoltage",
[IIO_CCT] = "cct",
};
static const char * const iio_modifier_names[] = {
@ -74,6 +75,10 @@ static const char * const iio_modifier_names[] = {
[IIO_MOD_SUM_SQUARED_X_Y_Z] = "x^2+y^2+z^2",
[IIO_MOD_LIGHT_BOTH] = "both",
[IIO_MOD_LIGHT_IR] = "ir",
[IIO_MOD_LIGHT_CLEAR] = "clear",
[IIO_MOD_LIGHT_RED] = "red",
[IIO_MOD_LIGHT_GREEN] = "green",
[IIO_MOD_LIGHT_BLUE] = "blue",
};
/* relies on pairs of these shared then separate */

23
drivers/staging/iio/Documentation/sysfs-bus-iio-light
View File

@ -82,3 +82,26 @@ 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]/in_intensity_clear[_input|_raw]
What: /sys/bus/iio/devices/device[n]/in_intensity_red[_input|_raw]
What: /sys/bus/iio/devices/device[n]/in_intensity_green[_input|_raw]
What: /sys/bus/iio/devices/device[n]/in_intensity_blue[_input|_raw]
KernelVersion: 3.4.0
Contact: linux-iio@vger.kernel.org
Description:
This property is supported by sensors that have a RGBC
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 (irradiance, uW/mm^2), then it should
include _raw.
What: /sys/bus/iio/devices/device[n]/in_cct0[_input|_raw]
KernelVersion: 3.4.0
Contact: linux-iio@vger.kernel.org
Description:
This should return the correlated color temperature from the
light sensor. If it comes back in SI units, it should also
include _input else it should include _raw to signify it is not
in SI units.

5
include/linux/iio/types.h
View File

@ -27,6 +27,7 @@ enum iio_chan_type {
IIO_TIMESTAMP,
IIO_CAPACITANCE,
IIO_ALTVOLTAGE,
IIO_CCT,
};
enum iio_modifier {
@ -46,6 +47,10 @@ enum iio_modifier {
IIO_MOD_LIGHT_IR,
IIO_MOD_ROOT_SUM_SQUARED_X_Y,
IIO_MOD_SUM_SQUARED_X_Y_Z,
IIO_MOD_LIGHT_CLEAR,
IIO_MOD_LIGHT_RED,
IIO_MOD_LIGHT_GREEN,
IIO_MOD_LIGHT_BLUE,
};
#define IIO_VAL_INT 1