samsung_sm8750/android_kernel_samsung_sm8750
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iio: accel: fxls8962af: Fix temperature calculation

Browse Source 
commit 16038474e3a0263572f36326ef85057aaf341814 upstream.

According to spec temperature should be returned in milli degrees Celsius.
Add in_temp_scale to calculate from Celsius to milli Celsius.

Fixes: a3e0b51884 ("iio: accel: add support for FXLS8962AF/FXLS8964AF accelerometers")
Cc: stable@vger.kernel.org
Reviewed-by: Marcelo Schmitt <marcelo.schmitt1@gmail.com>
Signed-off-by: Sean Nyekjaer <sean@geanix.com>
Link: https://patch.msgid.link/20250505-fxls-v4-1-a38652e21738@geanix.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Sean Nyekjaer
2025-05-05 21:20:07 +02:00
committed by Greg Kroah-Hartman
parent 3d849cc3df
commit 39c86833f9
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/iio/accel/fxls8962af-core.c
View File

@@ -20,6 +20,7 @@
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include <linux/regulator/consumer.h> #include <linux/regulator/consumer.h>
#include <linux/regmap.h> #include <linux/regmap.h>
#include <linux/units.h>
#include <linux/iio/buffer.h> #include <linux/iio/buffer.h>
#include <linux/iio/events.h> #include <linux/iio/events.h>
@@ -434,8 +435,16 @@ static int fxls8962af_read_raw(struct iio_dev *indio_dev,
*val = FXLS8962AF_TEMP_CENTER_VAL; *val = FXLS8962AF_TEMP_CENTER_VAL;
return IIO_VAL_INT; return IIO_VAL_INT;
case IIO_CHAN_INFO_SCALE: case IIO_CHAN_INFO_SCALE:
*val = 0; switch (chan->type) {
return fxls8962af_read_full_scale(data, val2); case IIO_TEMP:
*val = MILLIDEGREE_PER_DEGREE;
return IIO_VAL_INT;
case IIO_ACCEL:
*val = 0;
return fxls8962af_read_full_scale(data, val2);
default:
return -EINVAL;
}
case IIO_CHAN_INFO_SAMP_FREQ: case IIO_CHAN_INFO_SAMP_FREQ:
return fxls8962af_read_samp_freq(data, val, val2); return fxls8962af_read_samp_freq(data, val, val2);
default: default:
@@ -734,6 +743,7 @@ static const struct iio_event_spec fxls8962af_event[] = {
.type = IIO_TEMP, \ .type = IIO_TEMP, \
.address = FXLS8962AF_TEMP_OUT, \ .address = FXLS8962AF_TEMP_OUT, \
.info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \ .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \
BIT(IIO_CHAN_INFO_SCALE) | \
BIT(IIO_CHAN_INFO_OFFSET),\ BIT(IIO_CHAN_INFO_OFFSET),\
.scan_index = -1, \ .scan_index = -1, \
.scan_type = { \ .scan_type = { \