Linux-IIO Archive mirror
 help / color / mirror / Atom feed
From: Vasileios Amoiridis <vassilisamir@gmail.com>
To: jic23@kernel.org
Cc: lars@metafoo.de, andriy.shevchenko@linux.intel.com,
	ang.iglesiasg@gmail.com, mazziesaccount@gmail.com,
	ak@it-klinger.de, petre.rodan@subdimension.ro,
	phil@raspberrypi.com, 579lpy@gmail.com,
	linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org,
	Vasileios Amoiridis <vassilisamir@gmail.com>
Subject: [PATCH 2/4] iio: pressure: Add scale value for channels
Date: Sun,  3 Mar 2024 17:52:58 +0100	[thread overview]
Message-ID: <20240303165300.468011-3-vassilisamir@gmail.com> (raw)
In-Reply-To: <20240303165300.468011-1-vassilisamir@gmail.com>

Add extra IIO_CHAN_INFO_SCALE in order to be able to have the scales
for the values in userspace. Can be used for triggered buffers.

Signed-off-by: Vasileios Amoiridis <vassilisamir@gmail.com>
---
 drivers/iio/pressure/bmp280-core.c | 70 ++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)

diff --git a/drivers/iio/pressure/bmp280-core.c b/drivers/iio/pressure/bmp280-core.c
index 29a8b7195076..acdf6138d317 100644
--- a/drivers/iio/pressure/bmp280-core.c
+++ b/drivers/iio/pressure/bmp280-core.c
@@ -138,16 +138,19 @@ static const struct iio_chan_spec bmp280_channels[] = {
 	{
 		.type = IIO_PRESSURE,
 		.info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED) |
+				      BIT(IIO_CHAN_INFO_SCALE) |
 				      BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO),
 	},
 	{
 		.type = IIO_TEMP,
 		.info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED) |
+				      BIT(IIO_CHAN_INFO_SCALE) |
 				      BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO),
 	},
 	{
 		.type = IIO_HUMIDITYRELATIVE,
 		.info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED) |
+				      BIT(IIO_CHAN_INFO_SCALE) |
 				      BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO),
 	},
 };
@@ -156,6 +159,7 @@ static const struct iio_chan_spec bmp380_channels[] = {
 	{
 		.type = IIO_PRESSURE,
 		.info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED) |
+				      BIT(IIO_CHAN_INFO_SCALE) |
 				      BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO),
 		.info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ) |
 					   BIT(IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY),
@@ -163,6 +167,7 @@ static const struct iio_chan_spec bmp380_channels[] = {
 	{
 		.type = IIO_TEMP,
 		.info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED) |
+				      BIT(IIO_CHAN_INFO_SCALE) |
 				      BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO),
 		.info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ) |
 					   BIT(IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY),
@@ -170,6 +175,7 @@ static const struct iio_chan_spec bmp380_channels[] = {
 	{
 		.type = IIO_HUMIDITYRELATIVE,
 		.info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED) |
+				      BIT(IIO_CHAN_INFO_SCALE) |
 				      BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO),
 		.info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ) |
 					   BIT(IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY),
@@ -487,6 +493,70 @@ static int bmp280_read_raw(struct iio_dev *indio_dev,
 			break;
 		}
 		break;
+	case IIO_CHAN_INFO_SCALE:
+		switch (chan->type) {
+		case IIO_HUMIDITYRELATIVE:
+			if (!strcmp(indio_dev->name, "bme280")) {
+				*val = 1000;
+				*val2 = 1024;
+				ret = IIO_VAL_FRACTIONAL;
+			} else {
+				ret = -EINVAL;
+			}
+			break;
+		case IIO_PRESSURE:
+			if ((!strcmp(indio_dev->name, "bmp085")) ||
+			    (!strcmp(indio_dev->name, "bmp180")) ||
+			    (!strcmp(indio_dev->name, "bmp181"))) {
+				*val = 1;
+				*val2 = 1000;
+				ret = IIO_VAL_FRACTIONAL;
+			} else if ((!strcmp(indio_dev->name, "bmp280")) ||
+				   (!strcmp(indio_dev->name, "bme280"))) {
+				*val = 1;
+				*val2 = 256000;
+				ret = IIO_VAL_FRACTIONAL;
+			} else if (!strcmp(indio_dev->name, "bmp380")) {
+				*val = 1;
+				*val2 = 100000;
+				ret = IIO_VAL_FRACTIONAL;
+			} else if (!strcmp(indio_dev->name, "bmp580")) {
+				*val = 1;
+				*val2 = 64000;
+				ret = IIO_VAL_FRACTIONAL;
+			} else {
+				ret = -EINVAL;
+			}
+			break;
+		case IIO_TEMP:
+			if ((!strcmp(indio_dev->name, "bmp085")) ||
+			    (!strcmp(indio_dev->name, "bmp180")) ||
+			    (!strcmp(indio_dev->name, "bmp181"))) {
+				*val = 100;
+				*val2 = 1;
+				ret = IIO_VAL_FRACTIONAL;
+			} else if ((!strcmp(indio_dev->name, "bmp280")) ||
+				   (!strcmp(indio_dev->name, "bme280"))) {
+				*val = 10;
+				*val2 = 1;
+				ret = IIO_VAL_FRACTIONAL;
+			} else if (!strcmp(indio_dev->name, "bmp380")) {
+				*val = 10;
+				*val2 = 1;
+				ret = IIO_VAL_FRACTIONAL;
+			} else if (!strcmp(indio_dev->name, "bmp580")) {
+				*val = 1000;
+				*val2 = 16;
+				ret = IIO_VAL_FRACTIONAL_LOG2;
+			} else {
+				ret = -EINVAL;
+			}
+			break;
+		default:
+			ret = -EINVAL;
+			break;
+		}
+		break;
 	case IIO_CHAN_INFO_OVERSAMPLING_RATIO:
 		switch (chan->type) {
 		case IIO_HUMIDITYRELATIVE:
-- 
2.25.1


  parent reply	other threads:[~2024-03-03 16:53 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-03 16:52 [PATCH 0/4] Series to add triggered buffer support to BMP280 driver Vasileios Amoiridis
2024-03-03 16:52 ` [PATCH 1/4] iio: pressure: BMP280 core driver headers sorting Vasileios Amoiridis
2024-03-04 11:36   ` Andy Shevchenko
2024-03-09 18:09   ` Jonathan Cameron
2024-03-03 16:52 ` Vasileios Amoiridis [this message]
2024-03-04 11:42   ` [PATCH 2/4] iio: pressure: Add scale value for channels Andy Shevchenko
2024-03-09 18:28   ` Jonathan Cameron
2024-03-03 16:52 ` [PATCH 3/4] iio: pressure: Add timestamp and scan_masks for BMP280 driver Vasileios Amoiridis
2024-03-04 11:47   ` Andy Shevchenko
2024-03-04 18:50     ` Vasileios Amoiridis
2024-03-04 19:07       ` Andy Shevchenko
2024-03-09 18:12         ` Jonathan Cameron
2024-03-03 16:53 ` [PATCH 4/4] iio: pressure: Add triggered buffer support " Vasileios Amoiridis
2024-03-04 11:52   ` Andy Shevchenko
2024-03-04 19:08     ` Vasileios Amoiridis
2024-03-04 19:18       ` Andy Shevchenko
2024-03-04 20:05         ` Vasileios Amoiridis
2024-03-09 18:19           ` Jonathan Cameron
2024-03-09 18:32   ` Jonathan Cameron

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240303165300.468011-3-vassilisamir@gmail.com \
    --to=vassilisamir@gmail.com \
    --cc=579lpy@gmail.com \
    --cc=ak@it-klinger.de \
    --cc=andriy.shevchenko@linux.intel.com \
    --cc=ang.iglesiasg@gmail.com \
    --cc=jic23@kernel.org \
    --cc=lars@metafoo.de \
    --cc=linux-iio@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mazziesaccount@gmail.com \
    --cc=petre.rodan@subdimension.ro \
    --cc=phil@raspberrypi.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).