Commit a3117576 authored by Mike Looijmans's avatar Mike Looijmans Committed by Greg Kroah-Hartman

iio:chemical:bme680: Fix, report temperature in millidegrees

commit 9436f45d upstream.

The standard unit for temperature is millidegrees Celcius. Adapt the
driver to report in millidegrees instead of degrees.
Signed-off-by: default avatarMike Looijmans <mike.looijmans@topic.nl>
Fixes: 1b3bd859 ("iio: chemical: Add support for Bosch BME680 sensor");
Cc: <Stable@vger.kernel.org>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f7ee6890
...@@ -591,8 +591,7 @@ static int bme680_gas_config(struct bme680_data *data) ...@@ -591,8 +591,7 @@ static int bme680_gas_config(struct bme680_data *data)
return ret; return ret;
} }
static int bme680_read_temp(struct bme680_data *data, static int bme680_read_temp(struct bme680_data *data, int *val)
int *val, int *val2)
{ {
struct device *dev = regmap_get_device(data->regmap); struct device *dev = regmap_get_device(data->regmap);
int ret; int ret;
...@@ -625,10 +624,9 @@ static int bme680_read_temp(struct bme680_data *data, ...@@ -625,10 +624,9 @@ static int bme680_read_temp(struct bme680_data *data,
* compensate_press/compensate_humid to get compensated * compensate_press/compensate_humid to get compensated
* pressure/humidity readings. * pressure/humidity readings.
*/ */
if (val && val2) { if (val) {
*val = comp_temp; *val = comp_temp * 10; /* Centidegrees to millidegrees */
*val2 = 100; return IIO_VAL_INT;
return IIO_VAL_FRACTIONAL;
} }
return ret; return ret;
...@@ -643,7 +641,7 @@ static int bme680_read_press(struct bme680_data *data, ...@@ -643,7 +641,7 @@ static int bme680_read_press(struct bme680_data *data,
s32 adc_press; s32 adc_press;
/* Read and compensate temperature to get a reading of t_fine */ /* Read and compensate temperature to get a reading of t_fine */
ret = bme680_read_temp(data, NULL, NULL); ret = bme680_read_temp(data, NULL);
if (ret < 0) if (ret < 0)
return ret; return ret;
...@@ -676,7 +674,7 @@ static int bme680_read_humid(struct bme680_data *data, ...@@ -676,7 +674,7 @@ static int bme680_read_humid(struct bme680_data *data,
u32 comp_humidity; u32 comp_humidity;
/* Read and compensate temperature to get a reading of t_fine */ /* Read and compensate temperature to get a reading of t_fine */
ret = bme680_read_temp(data, NULL, NULL); ret = bme680_read_temp(data, NULL);
if (ret < 0) if (ret < 0)
return ret; return ret;
...@@ -769,7 +767,7 @@ static int bme680_read_raw(struct iio_dev *indio_dev, ...@@ -769,7 +767,7 @@ static int bme680_read_raw(struct iio_dev *indio_dev,
case IIO_CHAN_INFO_PROCESSED: case IIO_CHAN_INFO_PROCESSED:
switch (chan->type) { switch (chan->type) {
case IIO_TEMP: case IIO_TEMP:
return bme680_read_temp(data, val, val2); return bme680_read_temp(data, val);
case IIO_PRESSURE: case IIO_PRESSURE:
return bme680_read_press(data, val, val2); return bme680_read_press(data, val, val2);
case IIO_HUMIDITYRELATIVE: case IIO_HUMIDITYRELATIVE:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment