iio: hid-sensors: Accelerometer 3D: Raw read support
authorSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Fri, 18 Apr 2014 23:22:00 +0000 (00:22 +0100)
committerJonathan Cameron <jic23@kernel.org>
Mon, 5 May 2014 09:59:49 +0000 (10:59 +0100)
Added support for raw reading of channel. If the sensor is powered
off, it will turn on for reading value.

Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
drivers/iio/accel/hid-sensor-accel-3d.c

index cf61c87a47e96246b80deef93a7ade77f3d13b9d..69abf9163df7e3f61d4725a915464deb38c86c67 100644 (file)
@@ -22,6 +22,7 @@
 #include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/slab.h>
+#include <linux/delay.h>
 #include <linux/hid-sensor-hub.h>
 #include <linux/iio/iio.h>
 #include <linux/iio/sysfs.h>
@@ -60,6 +61,7 @@ static const struct iio_chan_spec accel_3d_channels[] = {
                .type = IIO_ACCEL,
                .modified = 1,
                .channel2 = IIO_MOD_X,
+               .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
                .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_OFFSET) |
                BIT(IIO_CHAN_INFO_SCALE) |
                BIT(IIO_CHAN_INFO_SAMP_FREQ) |
@@ -69,6 +71,7 @@ static const struct iio_chan_spec accel_3d_channels[] = {
                .type = IIO_ACCEL,
                .modified = 1,
                .channel2 = IIO_MOD_Y,
+               .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
                .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_OFFSET) |
                BIT(IIO_CHAN_INFO_SCALE) |
                BIT(IIO_CHAN_INFO_SAMP_FREQ) |
@@ -78,6 +81,7 @@ static const struct iio_chan_spec accel_3d_channels[] = {
                .type = IIO_ACCEL,
                .modified = 1,
                .channel2 = IIO_MOD_Z,
+               .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
                .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_OFFSET) |
                BIT(IIO_CHAN_INFO_SCALE) |
                BIT(IIO_CHAN_INFO_SAMP_FREQ) |
@@ -108,22 +112,33 @@ static int accel_3d_read_raw(struct iio_dev *indio_dev,
        u32 address;
        int ret;
        int ret_type;
+       s32 poll_value;
 
        *val = 0;
        *val2 = 0;
        switch (mask) {
        case 0:
+               poll_value = hid_sensor_read_poll_value(
+                                       &accel_state->common_attributes);
+               if (poll_value < 0)
+                       return -EINVAL;
+
+               hid_sensor_power_state(&accel_state->common_attributes, true);
+               msleep_interruptible(poll_value * 2);
                report_id = accel_state->accel[chan->scan_index].report_id;
                address = accel_3d_addresses[chan->scan_index];
                if (report_id >= 0)
                        *val = sensor_hub_input_attr_get_raw_value(
-                               accel_state->common_attributes.hsdev,
-                               HID_USAGE_SENSOR_ACCEL_3D, address,
-                               report_id);
+                                       accel_state->common_attributes.hsdev,
+                                       HID_USAGE_SENSOR_ACCEL_3D, address,
+                                       report_id);
                else {
                        *val = 0;
+                       hid_sensor_power_state(&accel_state->common_attributes,
+                                                false);
                        return -EINVAL;
                }
+               hid_sensor_power_state(&accel_state->common_attributes, false);
                ret_type = IIO_VAL_INT;
                break;
        case IIO_CHAN_INFO_SCALE: