diff options
author | Andreas Brauchli <a.brauchli@elementarea.net> | 2018-12-13 09:43:22 -0500 |
---|---|---|
committer | Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2018-12-16 09:05:58 -0500 |
commit | b170f7d48443d1ea3e4ffbf409025b5e5b1146fe (patch) | |
tree | 357d1ef2ffab280403eea3525fcaa912d368dc05 | |
parent | bf81deacc6facb6fada5b3bb31a832ef77cf7e87 (diff) |
iio: Add modifiers for ethanol and H2 gases
Add ethanol and H2 gas modifiers:
* IIO_MOD_ETHANOL
* IIO_MOD_H2
Signed-off-by: Andreas Brauchli <andreas.brauchli@sensirion.com>
Acked-by: Matt Ranostay <matt.ranostay@konsulko.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
-rw-r--r-- | Documentation/ABI/testing/sysfs-bus-iio | 4 | ||||
-rw-r--r-- | include/uapi/linux/iio/types.h | 2 | ||||
-rw-r--r-- | tools/iio/iio_event_monitor.c | 4 |
3 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/ABI/testing/sysfs-bus-iio b/Documentation/ABI/testing/sysfs-bus-iio index 67fd88bf7910..864f8efd12e5 100644 --- a/Documentation/ABI/testing/sysfs-bus-iio +++ b/Documentation/ABI/testing/sysfs-bus-iio | |||
@@ -1554,6 +1554,10 @@ What: /sys/bus/iio/devices/iio:deviceX/in_concentration_raw | |||
1554 | What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_raw | 1554 | What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_raw |
1555 | What: /sys/bus/iio/devices/iio:deviceX/in_concentration_co2_raw | 1555 | What: /sys/bus/iio/devices/iio:deviceX/in_concentration_co2_raw |
1556 | What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_co2_raw | 1556 | What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_co2_raw |
1557 | What: /sys/bus/iio/devices/iio:deviceX/in_concentration_ethanol_raw | ||
1558 | What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_ethanol_raw | ||
1559 | What: /sys/bus/iio/devices/iio:deviceX/in_concentration_h2_raw | ||
1560 | What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_h2_raw | ||
1557 | What: /sys/bus/iio/devices/iio:deviceX/in_concentration_voc_raw | 1561 | What: /sys/bus/iio/devices/iio:deviceX/in_concentration_voc_raw |
1558 | What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_voc_raw | 1562 | What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_voc_raw |
1559 | KernelVersion: 4.3 | 1563 | KernelVersion: 4.3 |
diff --git a/include/uapi/linux/iio/types.h b/include/uapi/linux/iio/types.h index c59adac24b1c..fdd81affca4b 100644 --- a/include/uapi/linux/iio/types.h +++ b/include/uapi/linux/iio/types.h | |||
@@ -92,6 +92,8 @@ enum iio_modifier { | |||
92 | IIO_MOD_PM2P5, | 92 | IIO_MOD_PM2P5, |
93 | IIO_MOD_PM4, | 93 | IIO_MOD_PM4, |
94 | IIO_MOD_PM10, | 94 | IIO_MOD_PM10, |
95 | IIO_MOD_ETHANOL, | ||
96 | IIO_MOD_H2, | ||
95 | }; | 97 | }; |
96 | 98 | ||
97 | enum iio_event_type { | 99 | enum iio_event_type { |
diff --git a/tools/iio/iio_event_monitor.c b/tools/iio/iio_event_monitor.c index f6b8003fbe3c..7bf9bde28bcc 100644 --- a/tools/iio/iio_event_monitor.c +++ b/tools/iio/iio_event_monitor.c | |||
@@ -115,6 +115,8 @@ static const char * const iio_modifier_names[] = { | |||
115 | [IIO_MOD_I] = "i", | 115 | [IIO_MOD_I] = "i", |
116 | [IIO_MOD_Q] = "q", | 116 | [IIO_MOD_Q] = "q", |
117 | [IIO_MOD_CO2] = "co2", | 117 | [IIO_MOD_CO2] = "co2", |
118 | [IIO_MOD_ETHANOL] = "ethanol", | ||
119 | [IIO_MOD_H2] = "h2", | ||
118 | [IIO_MOD_VOC] = "voc", | 120 | [IIO_MOD_VOC] = "voc", |
119 | [IIO_MOD_PM1] = "pm1", | 121 | [IIO_MOD_PM1] = "pm1", |
120 | [IIO_MOD_PM2P5] = "pm2p5", | 122 | [IIO_MOD_PM2P5] = "pm2p5", |
@@ -205,6 +207,8 @@ static bool event_is_known(struct iio_event_data *event) | |||
205 | case IIO_MOD_I: | 207 | case IIO_MOD_I: |
206 | case IIO_MOD_Q: | 208 | case IIO_MOD_Q: |
207 | case IIO_MOD_CO2: | 209 | case IIO_MOD_CO2: |
210 | case IIO_MOD_ETHANOL: | ||
211 | case IIO_MOD_H2: | ||
208 | case IIO_MOD_VOC: | 212 | case IIO_MOD_VOC: |
209 | case IIO_MOD_PM1: | 213 | case IIO_MOD_PM1: |
210 | case IIO_MOD_PM2P5: | 214 | case IIO_MOD_PM2P5: |