diff options
author | Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> | 2014-04-18 19:22:00 -0400 |
---|---|---|
committer | Jonathan Cameron <jic23@kernel.org> | 2014-05-05 05:59:48 -0400 |
commit | a269b9a0a27675c34c62c4e20c4ffb62054cd51a (patch) | |
tree | ccf8aa0887b23ffeb002dd6508a6831edf5774b1 /drivers/iio | |
parent | be8e48d67ecdb1cc1234ff4f32a6e5d0002e4672 (diff) |
iio: hid-sensors: Pressure: 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/pressure/hid-sensor-press.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/drivers/iio/pressure/hid-sensor-press.c b/drivers/iio/pressure/hid-sensor-press.c index e0e6409aa94e..ff69da4443b8 100644 --- a/drivers/iio/pressure/hid-sensor-press.c +++ b/drivers/iio/pressure/hid-sensor-press.c | |||
@@ -36,6 +36,10 @@ struct press_state { | |||
36 | struct hid_sensor_common common_attributes; | 36 | struct hid_sensor_common common_attributes; |
37 | struct hid_sensor_hub_attribute_info press_attr; | 37 | struct hid_sensor_hub_attribute_info press_attr; |
38 | u32 press_data; | 38 | u32 press_data; |
39 | int scale_pre_decml; | ||
40 | int scale_post_decml; | ||
41 | int scale_precision; | ||
42 | int value_offset; | ||
39 | }; | 43 | }; |
40 | 44 | ||
41 | /* Channel definitions */ | 45 | /* Channel definitions */ |
@@ -102,12 +106,12 @@ static int press_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 = press_state->press_attr.units; | 109 | *val = press_state->scale_pre_decml; |
106 | ret_type = IIO_VAL_INT; | 110 | *val2 = press_state->scale_post_decml; |
111 | ret_type = press_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 = press_state->value_offset; |
110 | press_state->press_attr.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 press_parse_report(struct platform_device *pdev, | |||
229 | dev_dbg(&pdev->dev, "press %x:%x\n", st->press_attr.index, | 233 | dev_dbg(&pdev->dev, "press %x:%x\n", st->press_attr.index, |
230 | st->press_attr.report_id); | 234 | st->press_attr.report_id); |
231 | 235 | ||
236 | st->scale_precision = hid_sensor_format_scale( | ||
237 | HID_USAGE_SENSOR_PRESSURE, | ||
238 | &st->press_attr, | ||
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, |