On 07/01/2012 11:20 AM, Peter Meerwald wrote: > this patch steals the RGBC-related stuff from Jon Brenner's proposal > (http://permalink.gmane.org/gmane.linux.kernel.iio/4354), CCT parts > are left out for now Ideally this would have Jon's ack (or signoff). I'll merge it in the meantime, but probably won't send to Greg for a day or two if Jon wants to add anything. > > the adjd_s311 driver is making use of RGBC modifiers > > shouldn't the documentation (sysfs-bus-iio-light) be migrated > from staging? > > Signed-off-by: Peter Meerwald <pmeerw@xxxxxxxxxx> > Cc: Jon Brenner <jbrenner@xxxxxxxxxxx> > --- > drivers/iio/industrialio-core.c | 4 ++++ > .../staging/iio/Documentation/sysfs-bus-iio-light | 13 +++++++++++++ > include/linux/iio/types.h | 4 ++++ > 3 files changed, 21 insertions(+) > > diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c > index bb3c692..0e2f997 100644 > --- a/drivers/iio/industrialio-core.c > +++ b/drivers/iio/industrialio-core.c > @@ -74,6 +74,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 */ > diff --git a/drivers/staging/iio/Documentation/sysfs-bus-iio-light b/drivers/staging/iio/Documentation/sysfs-bus-iio-light > index d52be03..1f4f6bf 100644 > --- a/drivers/staging/iio/Documentation/sysfs-bus-iio-light > +++ b/drivers/staging/iio/Documentation/sysfs-bus-iio-light > @@ -82,3 +82,16 @@ Contact: linux-iio@xxxxxxxxxxxxxxx > 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.6 > +Contact: linux-iio@xxxxxxxxxxxxxxx > +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. > diff --git a/include/linux/iio/types.h b/include/linux/iio/types.h > index e250401..63d85a8 100644 > --- a/include/linux/iio/types.h > +++ b/include/linux/iio/types.h > @@ -46,6 +46,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 > -- To unsubscribe from this list: send the line "unsubscribe linux-iio" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
