mirror of
https://github.com/torvalds/linux.git
synced 2026-09-24 06:24:02 +02:00
iio: hid-sensor: als: scale each channel individually
Some sensors have multiple channels (not just brightness but color ALS sensors) with different scaling factors. Signed-off-by: Daniel Schaefer <dhs@frame.work> Link: https://gitlab.freedesktop.org/hadess/iio-sensor-proxy/-/merge_requests/413 Tested-by: Sven Vainküla <sven@xn--vainkla-r2a.ee> #Asus ProArt PX13 laptop. Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> Signed-off-by: Jonathan Cameron <jonathan.cameron@oss.qualcomm.com>
This commit is contained in:
parent
1135d6875d
commit
cad928dad9
|
|
@ -33,9 +33,9 @@ struct als_state {
|
|||
u32 illum[CHANNEL_SCAN_INDEX_MAX];
|
||||
aligned_s64 timestamp;
|
||||
} scan;
|
||||
int scale_pre_decml;
|
||||
int scale_post_decml;
|
||||
int scale_precision;
|
||||
int scale_pre_decml[CHANNEL_SCAN_INDEX_MAX];
|
||||
int scale_post_decml[CHANNEL_SCAN_INDEX_MAX];
|
||||
int scale_precision[CHANNEL_SCAN_INDEX_MAX];
|
||||
int value_offset;
|
||||
int num_channels;
|
||||
s64 timestamp;
|
||||
|
|
@ -174,9 +174,11 @@ static int als_read_raw(struct iio_dev *indio_dev,
|
|||
ret_type = IIO_VAL_INT;
|
||||
break;
|
||||
case IIO_CHAN_INFO_SCALE:
|
||||
*val = als_state->scale_pre_decml;
|
||||
*val2 = als_state->scale_post_decml;
|
||||
ret_type = als_state->scale_precision;
|
||||
if (chan->scan_index >= CHANNEL_SCAN_INDEX_MAX)
|
||||
return -EINVAL;
|
||||
*val = als_state->scale_pre_decml[chan->scan_index];
|
||||
*val2 = als_state->scale_post_decml[chan->scan_index];
|
||||
ret_type = als_state->scale_precision[chan->scan_index];
|
||||
break;
|
||||
case IIO_CHAN_INFO_OFFSET:
|
||||
*val = als_state->value_offset;
|
||||
|
|
@ -327,6 +329,10 @@ static int als_parse_report(struct platform_device *pdev,
|
|||
};
|
||||
++index;
|
||||
|
||||
st->scale_precision[i] = hid_sensor_format_scale(usage_id,
|
||||
&st->als[i], &st->scale_pre_decml[i],
|
||||
&st->scale_post_decml[i]);
|
||||
|
||||
dev_dbg(&pdev->dev, "als %x:%x\n", st->als[i].index,
|
||||
st->als[i].report_id);
|
||||
}
|
||||
|
|
@ -336,10 +342,6 @@ static int als_parse_report(struct platform_device *pdev,
|
|||
if (index)
|
||||
ret = 0;
|
||||
|
||||
st->scale_precision = hid_sensor_format_scale(usage_id,
|
||||
&st->als[CHANNEL_SCAN_INDEX_INTENSITY],
|
||||
&st->scale_pre_decml, &st->scale_post_decml);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user