aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/iio
diff options
context:
space:
mode:
authorSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>2014-04-18 19:22:00 -0400
committerJonathan Cameron <jic23@kernel.org>2014-05-05 05:59:46 -0400
commit36783d09f1a5c0fdfe9c0d177b5491f0ed0509ce (patch)
treec595d6747df09d3e0321e5e6512ff7e6fd3c7a32 /drivers/iio
parent6c7db77e406d61275e41268c1829e847a7237a27 (diff)
iio: hid-sensors: ALS: adjust scale and offset
Using units and unit exponent to calculate scale which is compliant to IIO ABI. Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers/iio')
-rw-r--r--drivers/iio/light/hid-sensor-als.c17
1 files changed, 13 insertions, 4 deletions
diff --git a/drivers/iio/light/hid-sensor-als.c b/drivers/iio/light/hid-sensor-als.c
index 621541fb10a9..39b50be9d456 100644
--- a/drivers/iio/light/hid-sensor-als.c
+++ b/drivers/iio/light/hid-sensor-als.c
@@ -37,6 +37,10 @@ struct als_state {
37 struct hid_sensor_common common_attributes; 37 struct hid_sensor_common common_attributes;
38 struct hid_sensor_hub_attribute_info als_illum; 38 struct hid_sensor_hub_attribute_info als_illum;
39 u32 illum; 39 u32 illum;
40 int scale_pre_decml;
41 int scale_post_decml;
42 int scale_precision;
43 int value_offset;
40}; 44};
41 45
42/* Channel definitions */ 46/* Channel definitions */
@@ -102,12 +106,12 @@ static int als_read_raw(struct iio_dev *indio_dev,
102 ret_type = IIO_VAL_INT; 106 ret_type = IIO_VAL_INT;
103 break; 107 break;
104 case IIO_CHAN_INFO_SCALE: 108 case IIO_CHAN_INFO_SCALE:
105 *val = als_state->als_illum.units; 109 *val = als_state->scale_pre_decml;
106 ret_type = IIO_VAL_INT; 110 *val2 = als_state->scale_post_decml;
111 ret_type = als_state->scale_precision;
107 break; 112 break;
108 case IIO_CHAN_INFO_OFFSET: 113 case IIO_CHAN_INFO_OFFSET:
109 *val = hid_sensor_convert_exponent( 114 *val = als_state->value_offset;
110 als_state->als_illum.unit_expo);
111 ret_type = IIO_VAL_INT; 115 ret_type = IIO_VAL_INT;
112 break; 116 break;
113 case IIO_CHAN_INFO_SAMP_FREQ: 117 case IIO_CHAN_INFO_SAMP_FREQ:
@@ -229,6 +233,11 @@ static int als_parse_report(struct platform_device *pdev,
229 dev_dbg(&pdev->dev, "als %x:%x\n", st->als_illum.index, 233 dev_dbg(&pdev->dev, "als %x:%x\n", st->als_illum.index,
230 st->als_illum.report_id); 234 st->als_illum.report_id);
231 235
236 st->scale_precision = hid_sensor_format_scale(
237 HID_USAGE_SENSOR_ALS,
238 &st->als_illum,
239 &st->scale_pre_decml, &st->scale_post_decml);
240
232 /* Set Sensitivity field ids, when there is no individual modifier */ 241 /* Set Sensitivity field ids, when there is no individual modifier */
233 if (st->common_attributes.sensitivity.index < 0) { 242 if (st->common_attributes.sensitivity.index < 0) {
234 sensor_hub_input_get_attribute_info(hsdev, 243 sensor_hub_input_get_attribute_info(hsdev,