| Message ID | 20230919081054.2050714-7-Basavaraj.Natikar@amd.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 06790d4c69d1851573baa4459e5bf6ac986cb0eb |
| Headers | show |
| Series | Support light color temperature and chromaticity | expand |
On Tue, 19 Sep 2023 13:40:51 +0530 Basavaraj Natikar <Basavaraj.Natikar@amd.com> wrote: > In most cases, ambient color sensors also support the x and y light > colors, which represent the coordinates on the CIE 1931 chromaticity > diagram. Thus, add channel type for chromaticity. > > Signed-off-by: Basavaraj Natikar <Basavaraj.Natikar@amd.com> One small thing I fixed up whilst applying. Jonathan > --- > Documentation/ABI/testing/sysfs-bus-iio | 8 ++++++++ > drivers/iio/industrialio-core.c | 1 + > include/uapi/linux/iio/types.h | 1 + > tools/iio/iio_event_monitor.c | 1 + > 4 files changed, 11 insertions(+) > > diff --git a/Documentation/ABI/testing/sysfs-bus-iio b/Documentation/ABI/testing/sysfs-bus-iio > index 4cf7ed9ca57b..0c9389ad3709 100644 > --- a/Documentation/ABI/testing/sysfs-bus-iio > +++ b/Documentation/ABI/testing/sysfs-bus-iio > @@ -2186,3 +2186,11 @@ Contact: linux-iio@vger.kernel.org > Description: > Represents light color temperature, which measures light color > temperature in Kelvin. > + > +What: /sys/bus/iio/devices/iio:deviceX/in_chromaticity_x_raw > +What: /sys/bus/iio/devices/iio:deviceX/in_chromaticity_y_raw > +KernelVersion: 6.7 > +Contact: linux-iio@vger.kernel.org > +Description: > + The x and y light color coordinate on the CIE 1931 chromaticity > + diagram. > diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c > index cba942cadf97..6dc4d2b296bb 100644 > --- a/drivers/iio/industrialio-core.c > +++ b/drivers/iio/industrialio-core.c > @@ -91,6 +91,7 @@ static const char * const iio_chan_type_name_spec[] = { > [IIO_PHASE] = "phase", > [IIO_MASSCONCENTRATION] = "massconcentration", > [IIO_COLORTEMP] = "colortemp", > + [IIO_CHROMATICITY] = "chromaticity", > }; > > static const char * const iio_modifier_names[] = { > diff --git a/include/uapi/linux/iio/types.h b/include/uapi/linux/iio/types.h > index 08c20e540c13..4832c611c027 100644 > --- a/include/uapi/linux/iio/types.h > +++ b/include/uapi/linux/iio/types.h > @@ -48,6 +48,7 @@ enum iio_chan_type { > IIO_PHASE, > IIO_MASSCONCENTRATION, > IIO_COLORTEMP, > + IIO_CHROMATICITY, > }; > > enum iio_modifier { > diff --git a/tools/iio/iio_event_monitor.c b/tools/iio/iio_event_monitor.c > index a63741e43ddf..5edacc358c5d 100644 > --- a/tools/iio/iio_event_monitor.c > +++ b/tools/iio/iio_event_monitor.c > @@ -175,6 +175,7 @@ static bool event_is_known(struct iio_event_data *event) > case IIO_PHASE: > case IIO_MASSCONCENTRATION: > case IIO_COLORTEMP: > + case IIO_CHROMATICITY: This is missing updating the strings in the same file. I only notice whilst dealing with a merge conflict where the colortemp one was there and this wasn't. > break; > default: > return false;
diff --git a/Documentation/ABI/testing/sysfs-bus-iio b/Documentation/ABI/testing/sysfs-bus-iio index 4cf7ed9ca57b..0c9389ad3709 100644 --- a/Documentation/ABI/testing/sysfs-bus-iio +++ b/Documentation/ABI/testing/sysfs-bus-iio @@ -2186,3 +2186,11 @@ Contact: linux-iio@vger.kernel.org Description: Represents light color temperature, which measures light color temperature in Kelvin. + +What: /sys/bus/iio/devices/iio:deviceX/in_chromaticity_x_raw +What: /sys/bus/iio/devices/iio:deviceX/in_chromaticity_y_raw +KernelVersion: 6.7 +Contact: linux-iio@vger.kernel.org +Description: + The x and y light color coordinate on the CIE 1931 chromaticity + diagram. diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c index cba942cadf97..6dc4d2b296bb 100644 --- a/drivers/iio/industrialio-core.c +++ b/drivers/iio/industrialio-core.c @@ -91,6 +91,7 @@ static const char * const iio_chan_type_name_spec[] = { [IIO_PHASE] = "phase", [IIO_MASSCONCENTRATION] = "massconcentration", [IIO_COLORTEMP] = "colortemp", + [IIO_CHROMATICITY] = "chromaticity", }; static const char * const iio_modifier_names[] = { diff --git a/include/uapi/linux/iio/types.h b/include/uapi/linux/iio/types.h index 08c20e540c13..4832c611c027 100644 --- a/include/uapi/linux/iio/types.h +++ b/include/uapi/linux/iio/types.h @@ -48,6 +48,7 @@ enum iio_chan_type { IIO_PHASE, IIO_MASSCONCENTRATION, IIO_COLORTEMP, + IIO_CHROMATICITY, }; enum iio_modifier { diff --git a/tools/iio/iio_event_monitor.c b/tools/iio/iio_event_monitor.c index a63741e43ddf..5edacc358c5d 100644 --- a/tools/iio/iio_event_monitor.c +++ b/tools/iio/iio_event_monitor.c @@ -175,6 +175,7 @@ static bool event_is_known(struct iio_event_data *event) case IIO_PHASE: case IIO_MASSCONCENTRATION: case IIO_COLORTEMP: + case IIO_CHROMATICITY: break; default: return false;
In most cases, ambient color sensors also support the x and y light colors, which represent the coordinates on the CIE 1931 chromaticity diagram. Thus, add channel type for chromaticity. Signed-off-by: Basavaraj Natikar <Basavaraj.Natikar@amd.com> --- Documentation/ABI/testing/sysfs-bus-iio | 8 ++++++++ drivers/iio/industrialio-core.c | 1 + include/uapi/linux/iio/types.h | 1 + tools/iio/iio_event_monitor.c | 1 + 4 files changed, 11 insertions(+)