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>
This commit is contained in:

committed by
Jonathan Cameron

parent
be8e48d67e
commit
a269b9a0a2
@@ -36,6 +36,10 @@ struct press_state {
|
|||||||
struct hid_sensor_common common_attributes;
|
struct hid_sensor_common common_attributes;
|
||||||
struct hid_sensor_hub_attribute_info press_attr;
|
struct hid_sensor_hub_attribute_info press_attr;
|
||||||
u32 press_data;
|
u32 press_data;
|
||||||
|
int scale_pre_decml;
|
||||||
|
int scale_post_decml;
|
||||||
|
int scale_precision;
|
||||||
|
int value_offset;
|
||||||
};
|
};
|
||||||
|
|
||||||
/* Channel definitions */
|
/* Channel definitions */
|
||||||
@@ -102,12 +106,12 @@ static int press_read_raw(struct iio_dev *indio_dev,
|
|||||||
ret_type = IIO_VAL_INT;
|
ret_type = IIO_VAL_INT;
|
||||||
break;
|
break;
|
||||||
case IIO_CHAN_INFO_SCALE:
|
case IIO_CHAN_INFO_SCALE:
|
||||||
*val = press_state->press_attr.units;
|
*val = press_state->scale_pre_decml;
|
||||||
ret_type = IIO_VAL_INT;
|
*val2 = press_state->scale_post_decml;
|
||||||
|
ret_type = press_state->scale_precision;
|
||||||
break;
|
break;
|
||||||
case IIO_CHAN_INFO_OFFSET:
|
case IIO_CHAN_INFO_OFFSET:
|
||||||
*val = hid_sensor_convert_exponent(
|
*val = press_state->value_offset;
|
||||||
press_state->press_attr.unit_expo);
|
|
||||||
ret_type = IIO_VAL_INT;
|
ret_type = IIO_VAL_INT;
|
||||||
break;
|
break;
|
||||||
case IIO_CHAN_INFO_SAMP_FREQ:
|
case IIO_CHAN_INFO_SAMP_FREQ:
|
||||||
@@ -229,6 +233,11 @@ static int press_parse_report(struct platform_device *pdev,
|
|||||||
dev_dbg(&pdev->dev, "press %x:%x\n", st->press_attr.index,
|
dev_dbg(&pdev->dev, "press %x:%x\n", st->press_attr.index,
|
||||||
st->press_attr.report_id);
|
st->press_attr.report_id);
|
||||||
|
|
||||||
|
st->scale_precision = hid_sensor_format_scale(
|
||||||
|
HID_USAGE_SENSOR_PRESSURE,
|
||||||
|
&st->press_attr,
|
||||||
|
&st->scale_pre_decml, &st->scale_post_decml);
|
||||||
|
|
||||||
/* Set Sensitivity field ids, when there is no individual modifier */
|
/* Set Sensitivity field ids, when there is no individual modifier */
|
||||||
if (st->common_attributes.sensitivity.index < 0) {
|
if (st->common_attributes.sensitivity.index < 0) {
|
||||||
sensor_hub_input_get_attribute_info(hsdev,
|
sensor_hub_input_get_attribute_info(hsdev,
|
||||||
|
Reference in New Issue
Block a user