diff options
author | Irina Tirdea <irina.tirdea@intel.com> | 2015-01-11 14:10:10 -0500 |
---|---|---|
committer | Jonathan Cameron <jic23@kernel.org> | 2015-01-27 13:49:54 -0500 |
commit | d37f6836fa285882450e28d1cbc5a9b624911e7e (patch) | |
tree | 9ccac6fa388dd5769855439f8845ab36cb5ce5e7 | |
parent | 5a1a932981415661827f7edd9e99943a2a3b7b67 (diff) |
iio: core: Introduce IIO_CHAN_INFO_CALIBWEIGHT
Some devices need the weight of the user to compute other
parameters. One of this devices is Freescale's MMA9553L
(http://www.freescale.com/files/sensors/doc/ref_manual/MMA9553LSWRM.pdf)
that needs the weight of the user to compute the number of calories burnt.
Signed-off-by: Irina Tirdea <irina.tirdea@intel.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
-rw-r--r-- | Documentation/ABI/testing/sysfs-bus-iio | 7 | ||||
-rw-r--r-- | drivers/iio/industrialio-core.c | 1 | ||||
-rw-r--r-- | include/linux/iio/iio.h | 1 |
3 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/ABI/testing/sysfs-bus-iio b/Documentation/ABI/testing/sysfs-bus-iio index 80b5efb1cdbf..71dc8db4388b 100644 --- a/Documentation/ABI/testing/sysfs-bus-iio +++ b/Documentation/ABI/testing/sysfs-bus-iio | |||
@@ -351,6 +351,13 @@ Description: | |||
351 | to compute the stride length, distance, speed and activity | 351 | to compute the stride length, distance, speed and activity |
352 | type. | 352 | type. |
353 | 353 | ||
354 | What: /sys/bus/iio/devices/iio:deviceX/in_energy_calibweight | ||
355 | KernelVersion: 3.20 | ||
356 | Contact: linux-iio@vger.kernel.org | ||
357 | Description: | ||
358 | Weight of the user (in kg). It is needed by some pedometers | ||
359 | to compute the calories burnt by the user. | ||
360 | |||
354 | What: /sys/bus/iio/devices/iio:deviceX/in_accel_scale_available | 361 | What: /sys/bus/iio/devices/iio:deviceX/in_accel_scale_available |
355 | What: /sys/.../iio:deviceX/in_voltageX_scale_available | 362 | What: /sys/.../iio:deviceX/in_voltageX_scale_available |
356 | What: /sys/.../iio:deviceX/in_voltage-voltage_scale_available | 363 | What: /sys/.../iio:deviceX/in_voltage-voltage_scale_available |
diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c index 18a8ab911aab..4ee6fdfa92fe 100644 --- a/drivers/iio/industrialio-core.c +++ b/drivers/iio/industrialio-core.c | |||
@@ -125,6 +125,7 @@ static const char * const iio_chan_info_postfix[] = { | |||
125 | [IIO_CHAN_INFO_INT_TIME] = "integration_time", | 125 | [IIO_CHAN_INFO_INT_TIME] = "integration_time", |
126 | [IIO_CHAN_INFO_ENABLE] = "en", | 126 | [IIO_CHAN_INFO_ENABLE] = "en", |
127 | [IIO_CHAN_INFO_CALIBHEIGHT] = "calibheight", | 127 | [IIO_CHAN_INFO_CALIBHEIGHT] = "calibheight", |
128 | [IIO_CHAN_INFO_CALIBWEIGHT] = "calibweight", | ||
128 | }; | 129 | }; |
129 | 130 | ||
130 | /** | 131 | /** |
diff --git a/include/linux/iio/iio.h b/include/linux/iio/iio.h index 590202024857..51f16437dacc 100644 --- a/include/linux/iio/iio.h +++ b/include/linux/iio/iio.h | |||
@@ -40,6 +40,7 @@ enum iio_chan_info_enum { | |||
40 | IIO_CHAN_INFO_INT_TIME, | 40 | IIO_CHAN_INFO_INT_TIME, |
41 | IIO_CHAN_INFO_ENABLE, | 41 | IIO_CHAN_INFO_ENABLE, |
42 | IIO_CHAN_INFO_CALIBHEIGHT, | 42 | IIO_CHAN_INFO_CALIBHEIGHT, |
43 | IIO_CHAN_INFO_CALIBWEIGHT, | ||
43 | }; | 44 | }; |
44 | 45 | ||
45 | enum iio_shared_by { | 46 | enum iio_shared_by { |