]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
iio: hid-sensors: ALS: 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:51 +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/light/hid-sensor-als.c

index e124b395f320705a53ed524ce4fe1ec21a2c48eb..f34c94380b416fbb96532294e3877ced4156d5e0 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>
@@ -49,6 +50,7 @@ static const struct iio_chan_spec als_channels[] = {
                .type = IIO_INTENSITY,
                .modified = 1,
                .channel2 = IIO_MOD_LIGHT_BOTH,
+               .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) |
@@ -79,6 +81,7 @@ static int als_read_raw(struct iio_dev *indio_dev,
        u32 address;
        int ret;
        int ret_type;
+       s32 poll_value;
 
        *val = 0;
        *val2 = 0;
@@ -94,12 +97,23 @@ static int als_read_raw(struct iio_dev *indio_dev,
                        report_id = -1;
                        break;
                }
-               if (report_id >= 0)
+               if (report_id >= 0) {
+                       poll_value = hid_sensor_read_poll_value(
+                                               &als_state->common_attributes);
+                       if (poll_value < 0)
+                               return -EINVAL;
+
+                       hid_sensor_power_state(&als_state->common_attributes,
+                                               true);
+                       msleep_interruptible(poll_value * 2);
+
                        *val = sensor_hub_input_attr_get_raw_value(
-                               als_state->common_attributes.hsdev,
-                               HID_USAGE_SENSOR_ALS, address,
-                               report_id);
-               else {
+                                       als_state->common_attributes.hsdev,
+                                       HID_USAGE_SENSOR_ALS, address,
+                                       report_id);
+                       hid_sensor_power_state(&als_state->common_attributes,
+                                               false);
+               } else {
                        *val = 0;
                        return -EINVAL;
                }