aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/iio/gyro
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
commit6c7db77e406d61275e41268c1829e847a7237a27 (patch)
tree9a635821b46fab75bdd29ae41e9d70feed226561 /drivers/iio/gyro
parent73a24988201f1bc82143ad183c79206052ef2fe8 (diff)
iio: hid-sensors: Gyro 3D : 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/gyro')
-rw-r--r--drivers/iio/gyro/hid-sensor-gyro-3d.c17
1 files changed, 13 insertions, 4 deletions
diff --git a/drivers/iio/gyro/hid-sensor-gyro-3d.c b/drivers/iio/gyro/hid-sensor-gyro-3d.c
index 59d6bc3e04df..53ac06040fbe 100644
--- a/drivers/iio/gyro/hid-sensor-gyro-3d.c
+++ b/drivers/iio/gyro/hid-sensor-gyro-3d.c
@@ -42,6 +42,10 @@ struct gyro_3d_state {
42 struct hid_sensor_common common_attributes; 42 struct hid_sensor_common common_attributes;
43 struct hid_sensor_hub_attribute_info gyro[GYRO_3D_CHANNEL_MAX]; 43 struct hid_sensor_hub_attribute_info gyro[GYRO_3D_CHANNEL_MAX];
44 u32 gyro_val[GYRO_3D_CHANNEL_MAX]; 44 u32 gyro_val[GYRO_3D_CHANNEL_MAX];
45 int scale_pre_decml;
46 int scale_post_decml;
47 int scale_precision;
48 int value_offset;
45}; 49};
46 50
47static const u32 gyro_3d_addresses[GYRO_3D_CHANNEL_MAX] = { 51static const u32 gyro_3d_addresses[GYRO_3D_CHANNEL_MAX] = {
@@ -123,12 +127,12 @@ static int gyro_3d_read_raw(struct iio_dev *indio_dev,
123 ret_type = IIO_VAL_INT; 127 ret_type = IIO_VAL_INT;
124 break; 128 break;
125 case IIO_CHAN_INFO_SCALE: 129 case IIO_CHAN_INFO_SCALE:
126 *val = gyro_state->gyro[CHANNEL_SCAN_INDEX_X].units; 130 *val = gyro_state->scale_pre_decml;
127 ret_type = IIO_VAL_INT; 131 *val2 = gyro_state->scale_post_decml;
132 ret_type = gyro_state->scale_precision;
128 break; 133 break;
129 case IIO_CHAN_INFO_OFFSET: 134 case IIO_CHAN_INFO_OFFSET:
130 *val = hid_sensor_convert_exponent( 135 *val = gyro_state->value_offset;
131 gyro_state->gyro[CHANNEL_SCAN_INDEX_X].unit_expo);
132 ret_type = IIO_VAL_INT; 136 ret_type = IIO_VAL_INT;
133 break; 137 break;
134 case IIO_CHAN_INFO_SAMP_FREQ: 138 case IIO_CHAN_INFO_SAMP_FREQ:
@@ -262,6 +266,11 @@ static int gyro_3d_parse_report(struct platform_device *pdev,
262 st->gyro[1].index, st->gyro[1].report_id, 266 st->gyro[1].index, st->gyro[1].report_id,
263 st->gyro[2].index, st->gyro[2].report_id); 267 st->gyro[2].index, st->gyro[2].report_id);
264 268
269 st->scale_precision = hid_sensor_format_scale(
270 HID_USAGE_SENSOR_GYRO_3D,
271 &st->gyro[CHANNEL_SCAN_INDEX_X],
272 &st->scale_pre_decml, &st->scale_post_decml);
273
265 /* Set Sensitivity field ids, when there is no individual modifier */ 274 /* Set Sensitivity field ids, when there is no individual modifier */
266 if (st->common_attributes.sensitivity.index < 0) { 275 if (st->common_attributes.sensitivity.index < 0) {
267 sensor_hub_input_get_attribute_info(hsdev, 276 sensor_hub_input_get_attribute_info(hsdev,