iio: add IIO_MOD_O2 modifier

Add modifier IIO_MOD_O2 for O2 concentration reporting

Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.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 5c62bfb..405181f 100644 (file)
--- a/Documentation/ABI/testing/sysfs-bus-iio
+++ b/Documentation/ABI/testing/sysfs-bus-iio
@@ -1564,6 +1564,8 @@ What:             /sys/bus/iio/devices/iio:deviceX/in_concentration_ethanol_raw
 What:          /sys/bus/iio/devices/iio:deviceX/in_concentrationX_ethanol_raw
 What:          /sys/bus/iio/devices/iio:deviceX/in_concentration_h2_raw
 What:          /sys/bus/iio/devices/iio:deviceX/in_concentrationX_h2_raw
+What:          /sys/bus/iio/devices/iio:deviceX/in_concentration_o2_raw
+What:          /sys/bus/iio/devices/iio:deviceX/in_concentrationX_o2_raw
 What:          /sys/bus/iio/devices/iio:deviceX/in_concentration_voc_raw
 What:          /sys/bus/iio/devices/iio:deviceX/in_concentrationX_voc_raw
 KernelVersion: 4.3

diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
index 606d5e6..59003dc 100644 (file)
--- a/drivers/iio/industrialio-core.c
+++ b/drivers/iio/industrialio-core.c
@@ -133,6 +133,7 @@ static const char * const iio_modifier_names[] = {
        [IIO_MOD_PM10] = "pm10",
        [IIO_MOD_ETHANOL] = "ethanol",
        [IIO_MOD_H2] = "h2",
+       [IIO_MOD_O2] = "o2",
 };
 
 /* relies on pairs of these shared then separate */

diff --git a/include/uapi/linux/iio/types.h b/include/uapi/linux/iio/types.h
index fdd81af..48c1314 100644 (file)
--- a/include/uapi/linux/iio/types.h
+++ b/include/uapi/linux/iio/types.h
@@ -94,6 +94,7 @@ enum iio_modifier {
        IIO_MOD_PM10,
        IIO_MOD_ETHANOL,
        IIO_MOD_H2,
+       IIO_MOD_O2,
 };
 
 enum iio_event_type {

diff --git a/tools/iio/iio_event_monitor.c b/tools/iio/iio_event_monitor.c
index f115d16..bb03859 100644 (file)
--- a/tools/iio/iio_event_monitor.c
+++ b/tools/iio/iio_event_monitor.c
@@ -119,6 +119,7 @@ static const char * const iio_modifier_names[] = {
        [IIO_MOD_PM2P5] = "pm2p5",
        [IIO_MOD_PM4] = "pm4",
        [IIO_MOD_PM10] = "pm10",
+       [IIO_MOD_O2] = "o2",
 };
 
 static bool event_is_known(struct iio_event_data *event)
@@ -211,6 +212,7 @@ static bool event_is_known(struct iio_event_data *event)
        case IIO_MOD_PM2P5:
        case IIO_MOD_PM4:
        case IIO_MOD_PM10:
+       case IIO_MOD_O2:
                break;
        default:
                return false;