iio: core: Introduce ENERGY channel type

Human activity sensors report the energy burnt by the user.
One of this devices is Freescale's MMA9553L
(http://www.freescale.com/files/sensors/doc/ref_manual/MMA9553LSWRM.pdf)
that computes the number of calories based on weight and step rate.

Introduce a new channel type ENERGY to export these values.

Signed-off-by: Irina Tirdea <irina.tirdea@intel.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>

diff --git a/Documentation/ABI/testing/sysfs-bus-iio b/Documentation/ABI/testing/sysfs-bus-iio
index 831db8623e4b71dc6dc777022ad25364716e3020..33118862fb8bb7032397d0376c705cf105a7d84c 100644 (file)
--- a/Documentation/ABI/testing/sysfs-bus-iio
+++ b/Documentation/ABI/testing/sysfs-bus-iio
@@ -282,6 +282,7 @@ What:               /sys/bus/iio/devices/iio:deviceX/in_current_scale
 What:          /sys/bus/iio/devices/iio:deviceX/in_accel_scale
 What:          /sys/bus/iio/devices/iio:deviceX/in_accel_peak_scale
 What:          /sys/bus/iio/devices/iio:deviceX/in_anglvel_scale
+What:          /sys/bus/iio/devices/iio:deviceX/in_energy_scale
 What:          /sys/bus/iio/devices/iio:deviceX/in_magn_scale
 What:          /sys/bus/iio/devices/iio:deviceX/in_magn_x_scale
 What:          /sys/bus/iio/devices/iio:deviceX/in_magn_y_scale
@@ -1049,6 +1050,15 @@ Description:
                For a list of available output power modes read
                in_accel_power_mode_available.
 
+What:          /sys/.../iio:deviceX/in_energy_input
+What:          /sys/.../iio:deviceX/in_energy_raw
+KernelVersion: 3.20
+Contact:       linux-iio@vger.kernel.org
+Description:
+               This attribute is used to read the energy value reported by the
+               device (e.g.: human activity sensors report energy burnt by the
+               user). Units after application of scale are Joules.
+
 What:          /sys/bus/iio/devices/iio:deviceX/store_eeprom
 KernelVersion: 3.4.0
 Contact:       linux-iio@vger.kernel.org

diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
index 69feb912515a44e30d17bda54f939a5d318378dd..8d2c9ba85fd72f89d0ff28b54c756490b71f5dba 100644 (file)
--- a/drivers/iio/industrialio-core.c
+++ b/drivers/iio/industrialio-core.c
@@ -72,6 +72,7 @@ static const char * const iio_chan_type_name_spec[] = {
        [IIO_HUMIDITYRELATIVE] = "humidityrelative",
        [IIO_ACTIVITY] = "activity",
        [IIO_STEPS] = "steps",
+       [IIO_ENERGY] = "energy",
 };
 
 static const char * const iio_modifier_names[] = {

diff --git a/include/linux/iio/types.h b/include/linux/iio/types.h
index 904dcbbf0e6fedf2dc7120abb27f5e9c118dff63..26b8a1c5e2af1a04ce0e63e13676b57c954fd864 100644 (file)
--- a/include/linux/iio/types.h
+++ b/include/linux/iio/types.h
@@ -32,6 +32,7 @@ enum iio_chan_type {
        IIO_HUMIDITYRELATIVE,
        IIO_ACTIVITY,
        IIO_STEPS,
+       IIO_ENERGY,
 };
 
 enum iio_modifier {