iio:magnetometer:mag3110: Scale factor missing for temperature
authorPeter Meerwald <pmeerw@pmeerw.net>
Wed, 1 Oct 2014 20:59:00 +0000 (21:59 +0100)
committerJonathan Cameron <jic23@kernel.org>
Sat, 15 Feb 2014 09:54:46 +0000 (09:54 +0000)
temperature is reported in milli-Celsius

Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
drivers/iio/magnetometer/mag3110.c

index f66955fb3509e261f3a0d0cf7028f6178b3cb1a2..02e4f976588985240bac522e9f29d24c68688b8a 100644 (file)
@@ -183,8 +183,17 @@ static int mag3110_read_raw(struct iio_dev *indio_dev,
                        return -EINVAL;
                }
        case IIO_CHAN_INFO_SCALE:
-               *val = 0;
-               *val2 = 1000;
+               switch (chan->type) {
+               case IIO_MAGN:
+                       *val = 0;
+                       *val2 = 1000;
+                       return IIO_VAL_INT_PLUS_MICRO;
+               case IIO_TEMP:
+                       *val = 1000;
+                       return IIO_VAL_INT;
+               default:
+                       return -EINVAL;
+               }
                return IIO_VAL_INT_PLUS_MICRO;
        case IIO_CHAN_INFO_SAMP_FREQ:
                i = data->ctrl_reg1 >> MAG3110_CTRL_DR_SHIFT;
@@ -270,7 +279,8 @@ static const struct iio_chan_spec mag3110_channels[] = {
        MAG3110_CHANNEL(Z, 2),
        {
                .type = IIO_TEMP,
-               .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
+               .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
+                       BIT(IIO_CHAN_INFO_SCALE),
                .scan_index = 3,
                .scan_type = {
                        .sign = 's',