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>
---
drivers/iio/accel/fxls8962af-core.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/drivers/iio/accel/fxls8962af-core.c b/drivers/iio/accel/fxls8962af-core.c
index bf1d3923a181798a1c884ee08b62d86ab5aed26f..27165a14a4802bdecd9a89c38c6cda294088c5c8 100644
--- a/drivers/iio/accel/fxls8962af-core.c
+++ b/drivers/iio/accel/fxls8962af-core.c
@@ -23,6 +23,7 @@
#include <linux/regulator/consumer.h>
#include <linux/regmap.h>
#include <linux/types.h>
+#include <linux/units.h>
#include <linux/iio/buffer.h>
#include <linux/iio/events.h>
@@ -439,8 +440,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 = 2 * MSEC_PER_SEC;
+ 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:
@@ -736,6 +745,7 @@ static const struct iio_event_spec fxls8962af_event[] = {
.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 = { \
--
2.47.1
On Mon, 05 May 2025 08:20:19 +0200
Sean Nyekjaer <sean@geanix.com> wrote:
> 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>
See below.
> ---
> drivers/iio/accel/fxls8962af-core.c | 14 ++++++++++++--
> 1 file changed, 12 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/iio/accel/fxls8962af-core.c b/drivers/iio/accel/fxls8962af-core.c
> index bf1d3923a181798a1c884ee08b62d86ab5aed26f..27165a14a4802bdecd9a89c38c6cda294088c5c8 100644
> --- a/drivers/iio/accel/fxls8962af-core.c
> +++ b/drivers/iio/accel/fxls8962af-core.c
> @@ -23,6 +23,7 @@
> #include <linux/regulator/consumer.h>
> #include <linux/regmap.h>
> #include <linux/types.h>
> +#include <linux/units.h>
>
> #include <linux/iio/buffer.h>
> #include <linux/iio/events.h>
> @@ -439,8 +440,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 = 2 * MSEC_PER_SEC;
For a temperature? Andy was referring to that particular units.h
define for a the delay that happened to be below the code you were changing
in v1 not this one! Here we have MILLIDEGREE_PER_DEGREE defined.
> + 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:
> @@ -736,6 +745,7 @@ static const struct iio_event_spec fxls8962af_event[] = {
> .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 = { \
>
On Mon, May 05, 2025 at 05:51:20PM +0100, Jonathan Cameron wrote:
> On Mon, 05 May 2025 08:20:19 +0200
> Sean Nyekjaer <sean@geanix.com> wrote:
>
> > 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>
> See below.
>
> > ---
> > drivers/iio/accel/fxls8962af-core.c | 14 ++++++++++++--
> > 1 file changed, 12 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/iio/accel/fxls8962af-core.c b/drivers/iio/accel/fxls8962af-core.c
> > index bf1d3923a181798a1c884ee08b62d86ab5aed26f..27165a14a4802bdecd9a89c38c6cda294088c5c8 100644
> > --- a/drivers/iio/accel/fxls8962af-core.c
> > +++ b/drivers/iio/accel/fxls8962af-core.c
> > @@ -23,6 +23,7 @@
> > #include <linux/regulator/consumer.h>
> > #include <linux/regmap.h>
> > #include <linux/types.h>
> > +#include <linux/units.h>
> >
> > #include <linux/iio/buffer.h>
> > #include <linux/iio/events.h>
> > @@ -439,8 +440,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 = 2 * MSEC_PER_SEC;
>
> For a temperature? Andy was referring to that particular units.h
> define for a the delay that happened to be below the code you were changing
> in v1 not this one! Here we have MILLIDEGREE_PER_DEGREE defined.
>
Oops, sorry :/ Will do a v4
> > + 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:
> > @@ -736,6 +745,7 @@ static const struct iio_event_spec fxls8962af_event[] = {
> > .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 = { \
> >
>
© 2016 - 2026 Red Hat, Inc.