Merge tag 'devicetree-fixes-for-5.17-1' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / drivers / iio / accel / sca3000.c

diff --git a/drivers/iio/accel/sca3000.c b/drivers/iio/accel/sca3000.c
index c6b7530..43ecacb 100644 (file)
--- a/drivers/iio/accel/sca3000.c
+++ b/drivers/iio/accel/sca3000.c
@@ -534,6 +534,13 @@ static const struct iio_chan_spec sca3000_channels_with_temp[] = {
                        BIT(IIO_CHAN_INFO_OFFSET),
                /* No buffer support */
                .scan_index = -1,
+               .scan_type = {
+                       .sign = 'u',
+                       .realbits = 9,
+                       .storagebits = 16,
+                       .shift = 5,
+                       .endianness = IIO_BE,
+               },
        },
        {
                .type = IIO_ACCEL,
@@ -730,8 +737,9 @@ static int sca3000_read_raw(struct iio_dev *indio_dev,
                                mutex_unlock(&st->lock);
                                return ret;
                        }
-                       *val = (be16_to_cpup((__be16 *)st->rx) >> 3) & 0x1FFF;
-                       *val = sign_extend32(*val, 12);
+                       *val = sign_extend32(be16_to_cpup((__be16 *)st->rx) >>
+                                            chan->scan_type.shift,
+                                            chan->scan_type.realbits - 1);
                } else {
                        /* get the temperature when available */
                        ret = sca3000_read_data_short(st,
@@ -741,8 +749,9 @@ static int sca3000_read_raw(struct iio_dev *indio_dev,
                                mutex_unlock(&st->lock);
                                return ret;
                        }
-                       *val = ((st->rx[0] & 0x3F) << 3) |
-                              ((st->rx[1] & 0xE0) >> 5);
+                       *val = (be16_to_cpup((__be16 *)st->rx) >>
+                               chan->scan_type.shift) &
+                               GENMASK(chan->scan_type.realbits - 1, 0);
                }
                mutex_unlock(&st->lock);
                return IIO_VAL_INT;