Commit f51171ce authored by Vasileios Amoiridis's avatar Vasileios Amoiridis Committed by Jonathan Cameron
Browse files

iio: chemical: bme680: Add SCALE and RAW channels 



Add SCALE,RAW channels to the device. Even though PROCESSED should be
kept for backwards compatibility add comment to avoid using it if the
value is not actually reported in IIO values.

Signed-off-by: default avatarVasileios Amoiridis <vassilisamir@gmail.com>
Link: https://patch.msgid.link/20241102131311.36210-3-vassilisamir@gmail.com


Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 4865ee12

drivers/iio/chemical/bme680_core.c

+51 −0
Original line number Diff line number Diff line
@@ -144,17 +144,26 @@ EXPORT_SYMBOL_NS(bme680_regmap_config, IIO_BME680); 
static const struct iio_chan_spec bme680_channels[] = {

	{

		.type = IIO_TEMP,

		/* PROCESSED maintained for ABI backwards compatibility */

		.info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED) |

				      BIT(IIO_CHAN_INFO_RAW) |

				      BIT(IIO_CHAN_INFO_SCALE) |

				      BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO),

	},

	{

		.type = IIO_PRESSURE,

		/* PROCESSED maintained for ABI backwards compatibility */

		.info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED) |

				      BIT(IIO_CHAN_INFO_RAW) |

				      BIT(IIO_CHAN_INFO_SCALE) |

				      BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO),

	},

	{

		.type = IIO_HUMIDITYRELATIVE,

		/* PROCESSED maintained for ABI backwards compatibility */

		.info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED) |

				      BIT(IIO_CHAN_INFO_RAW) |

				      BIT(IIO_CHAN_INFO_SCALE) |

				      BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO),

	},

	{
@@ -787,6 +796,48 @@ static int bme680_read_raw(struct iio_dev *indio_dev, 
		default:

			return -EINVAL;

		}

	case IIO_CHAN_INFO_RAW:

		switch (chan->type) {

		case IIO_TEMP:

			ret = bme680_read_temp(data, (s16 *)&chan_val);

			if (ret)

				return ret;



			*val = chan_val;

			return IIO_VAL_INT;

		case IIO_PRESSURE:

			ret = bme680_read_press(data, &chan_val);

			if (ret)

				return ret;



			*val = chan_val;

			return IIO_VAL_INT;

		case IIO_HUMIDITYRELATIVE:

			ret = bme680_read_humid(data, &chan_val);

			if (ret)

				return ret;



			*val = chan_val;

			return IIO_VAL_INT;

		default:

			return -EINVAL;

		}

	case IIO_CHAN_INFO_SCALE:

		switch (chan->type) {

		case IIO_TEMP:

			*val = 10;

			return IIO_VAL_INT;

		case IIO_PRESSURE:

			*val = 1;

			*val2 = 1000;

			return IIO_VAL_FRACTIONAL;

		case IIO_HUMIDITYRELATIVE:

			*val = 1;

			*val2 = 1000;

			return IIO_VAL_FRACTIONAL;

		default:

			return -EINVAL;

		}

	case IIO_CHAN_INFO_OVERSAMPLING_RATIO:

		switch (chan->type) {

		case IIO_TEMP: