aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/iio/magnetometer
diff options
context:
space:
mode:
authorPeter Meerwald <pmeerw@pmeerw.net>2014-10-01 16:59:00 -0400
committerJonathan Cameron <jic23@kernel.org>2014-02-15 04:54:46 -0500
commitf9279d3a8cc8e518d21784d0152f04b5ee6635cb (patch)
tree6f00aa69d249d4b10b777a25fce579376162b2f8 /drivers/iio/magnetometer
parentcc7c0f7e078a19da3d50fb9ecb7b34d01fd521d2 (diff)
iio:magnetometer:mag3110: Scale factor missing for temperature
temperature is reported in milli-Celsius Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers/iio/magnetometer')
-rw-r--r--drivers/iio/magnetometer/mag3110.c16
1 files changed, 13 insertions, 3 deletions
diff --git a/drivers/iio/magnetometer/mag3110.c b/drivers/iio/magnetometer/mag3110.c
index f66955fb3509..02e4f9765889 100644
--- a/drivers/iio/magnetometer/mag3110.c
+++ b/drivers/iio/magnetometer/mag3110.c
@@ -183,8 +183,17 @@ static int mag3110_read_raw(struct iio_dev *indio_dev,
183 return -EINVAL; 183 return -EINVAL;
184 } 184 }
185 case IIO_CHAN_INFO_SCALE: 185 case IIO_CHAN_INFO_SCALE:
186 *val = 0; 186 switch (chan->type) {
187 *val2 = 1000; 187 case IIO_MAGN:
188 *val = 0;
189 *val2 = 1000;
190 return IIO_VAL_INT_PLUS_MICRO;
191 case IIO_TEMP:
192 *val = 1000;
193 return IIO_VAL_INT;
194 default:
195 return -EINVAL;
196 }
188 return IIO_VAL_INT_PLUS_MICRO; 197 return IIO_VAL_INT_PLUS_MICRO;
189 case IIO_CHAN_INFO_SAMP_FREQ: 198 case IIO_CHAN_INFO_SAMP_FREQ:
190 i = data->ctrl_reg1 >> MAG3110_CTRL_DR_SHIFT; 199 i = data->ctrl_reg1 >> MAG3110_CTRL_DR_SHIFT;
@@ -270,7 +279,8 @@ static const struct iio_chan_spec mag3110_channels[] = {
270 MAG3110_CHANNEL(Z, 2), 279 MAG3110_CHANNEL(Z, 2),
271 { 280 {
272 .type = IIO_TEMP, 281 .type = IIO_TEMP,
273 .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), 282 .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
283 BIT(IIO_CHAN_INFO_SCALE),
274 .scan_index = 3, 284 .scan_index = 3,
275 .scan_type = { 285 .scan_type = {
276 .sign = 's', 286 .sign = 's',