iio: Add modifier for DUV light

Signed-off-by: Maxime Roussin-Bélanger <maxime.roussinbelanger@gmail.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/Documentation/ABI/testing/sysfs-bus-iio b/Documentation/ABI/testing/sysfs-bus-iio
index c9cfa833cf472da4c8c12f791a0467c13b0ac5b4..a5b4f223641d909cac3bd09777a9502840530f13 100644 (file)
--- a/Documentation/ABI/testing/sysfs-bus-iio
+++ b/Documentation/ABI/testing/sysfs-bus-iio
@@ -1307,13 +1307,16 @@ What:           /sys/.../iio:deviceX/in_intensityY_raw
 What:          /sys/.../iio:deviceX/in_intensityY_ir_raw
 What:          /sys/.../iio:deviceX/in_intensityY_both_raw
 What:          /sys/.../iio:deviceX/in_intensityY_uv_raw
+What:          /sys/.../iio:deviceX/in_intensityY_duv_raw
 KernelVersion: 3.4
 Contact:       linux-iio@vger.kernel.org
 Description:
                Unit-less light intensity. Modifiers both and ir indicate
                that measurements contain visible and infrared light
-               components or just infrared light, respectively. Modifier uv indicates
-               that measurements contain ultraviolet light components.
+               components or just infrared light, respectively. Modifier
+               uv indicates that measurements contain ultraviolet light
+               components. Modifier duv indicates that measurements
+               contain deep ultraviolet light components.
 
 What:          /sys/.../iio:deviceX/in_uvindex_input
 KernelVersion: 4.6

diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
index a16ad5a4ab0cbe4637955bc19267fbafd35c1950..a062cfddc5af76da66a14bcf4178ee8487925099 100644 (file)
--- a/drivers/iio/industrialio-core.c
+++ b/drivers/iio/industrialio-core.c
@@ -110,6 +110,7 @@ static const char * const iio_modifier_names[] = {
        [IIO_MOD_LIGHT_GREEN] = "green",
        [IIO_MOD_LIGHT_BLUE] = "blue",
        [IIO_MOD_LIGHT_UV] = "uv",
+       [IIO_MOD_LIGHT_DUV] = "duv",
        [IIO_MOD_QUATERNION] = "quaternion",
        [IIO_MOD_TEMP_AMBIENT] = "ambient",
        [IIO_MOD_TEMP_OBJECT] = "object",

diff --git a/include/uapi/linux/iio/types.h b/include/uapi/linux/iio/types.h
index e4df3cc268db1fc7ea2a83db64d2c5070d98c349..92baabc103acbd22f7ca1487687401bf8ee7d5bd 100644 (file)
--- a/include/uapi/linux/iio/types.h
+++ b/include/uapi/linux/iio/types.h
@@ -86,6 +86,7 @@ enum iio_modifier {
        IIO_MOD_CO2,
        IIO_MOD_VOC,
        IIO_MOD_LIGHT_UV,
+       IIO_MOD_LIGHT_DUV,
 };
 
 enum iio_event_type {

diff --git a/tools/iio/iio_event_monitor.c b/tools/iio/iio_event_monitor.c
index f478f5558720c75588c4786b239084b798ea5133..ac2de6b7e89f5e07801e8c8198c9228404a56bfc 100644 (file)
--- a/tools/iio/iio_event_monitor.c
+++ b/tools/iio/iio_event_monitor.c
@@ -98,6 +98,7 @@ static const char * const iio_modifier_names[] = {
        [IIO_MOD_LIGHT_GREEN] = "green",
        [IIO_MOD_LIGHT_BLUE] = "blue",
        [IIO_MOD_LIGHT_UV] = "uv",
+       [IIO_MOD_LIGHT_DUV] = "duv",
        [IIO_MOD_QUATERNION] = "quaternion",
        [IIO_MOD_TEMP_AMBIENT] = "ambient",
        [IIO_MOD_TEMP_OBJECT] = "object",
@@ -182,6 +183,7 @@ static bool event_is_known(struct iio_event_data *event)
        case IIO_MOD_LIGHT_GREEN:
        case IIO_MOD_LIGHT_BLUE:
        case IIO_MOD_LIGHT_UV:
+       case IIO_MOD_LIGHT_DUV:
        case IIO_MOD_QUATERNION:
        case IIO_MOD_TEMP_AMBIENT:
        case IIO_MOD_TEMP_OBJECT: