]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
iio: accel: fxls8962af: Fix temperature calculation
authorSean Nyekjaer <sean@geanix.com>
Mon, 5 May 2025 19:20:07 +0000 (21:20 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 27 Jun 2025 10:05:34 +0000 (11:05 +0100)
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: a3e0b51884ee ("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>
drivers/iio/accel/fxls8962af-core.c

index 43ddd8ac2e297050a3d685efc2a9dc4d1aa91f27..deff8ceb42fa11ced9861949fbd21159b4696816 100644 (file)
@@ -20,6 +20,7 @@
 #include <linux/pm_runtime.h>
 #include <linux/regulator/consumer.h>
 #include <linux/regmap.h>
+#include <linux/units.h>
 
 #include <linux/iio/buffer.h>
 #include <linux/iio/iio.h>
@@ -416,8 +417,16 @@ static int fxls8962af_read_raw(struct iio_dev *indio_dev,
                *val = FXLS8962AF_TEMP_CENTER_VAL;
                return IIO_VAL_INT;
        case IIO_CHAN_INFO_SCALE:
-               *val = 0;
-               return fxls8962af_read_full_scale(data, val2);
+               switch (chan->type) {
+               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:
                return fxls8962af_read_samp_freq(data, val, val2);
        default:
@@ -494,6 +503,7 @@ static int fxls8962af_set_watermark(struct iio_dev *indio_dev, unsigned val)
        .type = IIO_TEMP, \
        .address = FXLS8962AF_TEMP_OUT, \
        .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \
+                             BIT(IIO_CHAN_INFO_SCALE) | \
                              BIT(IIO_CHAN_INFO_OFFSET),\
        .scan_index = -1, \
        .scan_type = { \