diff options
author | Harald Geyer <harald@ccbib.org> | 2013-12-01 10:08:00 -0500 |
---|---|---|
committer | Jonathan Cameron <jic23@kernel.org> | 2013-12-03 15:22:29 -0500 |
commit | ac216aa290c48a5e9d7b9f2473abb977a175683a (patch) | |
tree | 9292b2f5794f8620eb19cc6c0f6f34be04b77fd5 | |
parent | 6f93910ebae3f0ca4c0db1ba098d1635618b9c2f (diff) |
iio: Add support for humidity sensors
There are already humidity sensors in the hwmon subsystem,
so we use their unit (milli percent) here as well.
Signed-off-by: Harald Geyer <harald@ccbib.org>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
-rw-r--r-- | Documentation/ABI/testing/sysfs-bus-iio | 13 | ||||
-rw-r--r-- | drivers/iio/industrialio-core.c | 1 | ||||
-rw-r--r-- | include/linux/iio/types.h | 1 |
3 files changed, 15 insertions, 0 deletions
diff --git a/Documentation/ABI/testing/sysfs-bus-iio b/Documentation/ABI/testing/sysfs-bus-iio index b20e829d350f..6e02c5029152 100644 --- a/Documentation/ABI/testing/sysfs-bus-iio +++ b/Documentation/ABI/testing/sysfs-bus-iio | |||
@@ -197,6 +197,19 @@ Description: | |||
197 | Raw pressure measurement from channel Y. Units after | 197 | Raw pressure measurement from channel Y. Units after |
198 | application of scale and offset are kilopascal. | 198 | application of scale and offset are kilopascal. |
199 | 199 | ||
200 | What: /sys/bus/iio/devices/iio:deviceX/in_humidityrelative_raw | ||
201 | KernelVersion: 3.14 | ||
202 | Contact: linux-iio@vger.kernel.org | ||
203 | Description: | ||
204 | Raw humidity measurement of air. Units after application of | ||
205 | scale and offset are milli percent. | ||
206 | |||
207 | What: /sys/bus/iio/devices/iio:deviceX/in_humidityrelative_input | ||
208 | KernelVersion: 3.14 | ||
209 | Contact: linux-iio@vger.kernel.org | ||
210 | Description: | ||
211 | Scaled humidity measurement in milli percent. | ||
212 | |||
200 | What: /sys/bus/iio/devices/iio:deviceX/in_accel_offset | 213 | What: /sys/bus/iio/devices/iio:deviceX/in_accel_offset |
201 | What: /sys/bus/iio/devices/iio:deviceX/in_accel_x_offset | 214 | What: /sys/bus/iio/devices/iio:deviceX/in_accel_x_offset |
202 | What: /sys/bus/iio/devices/iio:deviceX/in_accel_y_offset | 215 | What: /sys/bus/iio/devices/iio:deviceX/in_accel_y_offset |
diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c index 2fe88c189f74..acc911a836ca 100644 --- a/drivers/iio/industrialio-core.c +++ b/drivers/iio/industrialio-core.c | |||
@@ -69,6 +69,7 @@ static const char * const iio_chan_type_name_spec[] = { | |||
69 | [IIO_ALTVOLTAGE] = "altvoltage", | 69 | [IIO_ALTVOLTAGE] = "altvoltage", |
70 | [IIO_CCT] = "cct", | 70 | [IIO_CCT] = "cct", |
71 | [IIO_PRESSURE] = "pressure", | 71 | [IIO_PRESSURE] = "pressure", |
72 | [IIO_HUMIDITYRELATIVE] = "humidityrelative", | ||
72 | }; | 73 | }; |
73 | 74 | ||
74 | static const char * const iio_modifier_names[] = { | 75 | static const char * const iio_modifier_names[] = { |
diff --git a/include/linux/iio/types.h b/include/linux/iio/types.h index 4ac928ee31c5..084d882fe01b 100644 --- a/include/linux/iio/types.h +++ b/include/linux/iio/types.h | |||
@@ -29,6 +29,7 @@ enum iio_chan_type { | |||
29 | IIO_ALTVOLTAGE, | 29 | IIO_ALTVOLTAGE, |
30 | IIO_CCT, | 30 | IIO_CCT, |
31 | IIO_PRESSURE, | 31 | IIO_PRESSURE, |
32 | IIO_HUMIDITYRELATIVE, | ||
32 | }; | 33 | }; |
33 | 34 | ||
34 | enum iio_modifier { | 35 | enum iio_modifier { |