Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1318084

[PATCH 1/2] iio: pressure: ms5611: Add IIO_CHAN_INFO_SCALE to mask

Path csiph.com!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod
From Daniel Baluta <daniel.baluta@intel.com>
Newsgroups linux.kernel
Subject [PATCH 1/2] iio: pressure: ms5611: Add IIO_CHAN_INFO_SCALE to mask
Date Tue, 26 Jan 2016 16:50:03 +0100
Message-ID <qVe2v-67x-29@gated-at.bofh.it> (permalink)
References <qVe2t-67x-1@gated-at.bofh.it>
X-Extloop1 1
X-Ironport-Av E=Sophos;i="5.22,350,1449561600"; d="scan'208";a="901468352"
X-Mailer git-send-email 2.5.0
Sender robomod@news.nic.it
List-ID <linux-kernel.vger.kernel.org>
X-Mailing-List linux-kernel@vger.kernel.org
Approved robomod@news.nic.it
Lines 49
Organization linux.* mail to news gateway
X-Original-Cc knaack.h@gmx.de, lars@metafoo.de, ludovic.tancerel@maplehightech.com, tduszyns@gmail.com, akinobu.mita@gmail.com, daniel.baluta@intel.com, k.kozlowski@samsung.com, afd@ti.com, broonie@kernel.org, linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, lucas.demarchi@intel.com
X-Original-Date Tue, 26 Jan 2016 17:49:07 +0200
X-Original-Message-ID <1453823348-23074-2-git-send-email-daniel.baluta@intel.com>
X-Original-References <1453823348-23074-1-git-send-email-daniel.baluta@intel.com>
X-Original-Sender linux-kernel-owner@vger.kernel.org
Xref csiph.com linux.kernel:1318084

Show key headers only | View raw


This allows data exported via buffer interface to be converted
to standard units in userspace.

Signed-off-by: Daniel Baluta <daniel.baluta@intel.com>
---
 drivers/iio/pressure/ms5611_core.c | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/drivers/iio/pressure/ms5611_core.c b/drivers/iio/pressure/ms5611_core.c
index 2f3d9b4..6cf0e55 100644
--- a/drivers/iio/pressure/ms5611_core.c
+++ b/drivers/iio/pressure/ms5611_core.c
@@ -201,6 +201,18 @@ static int ms5611_read_raw(struct iio_dev *indio_dev,
 		default:
 			return -EINVAL;
 		}
+	case IIO_CHAN_INFO_SCALE:
+		switch (chan->type) {
+		case IIO_TEMP:
+			*val = 10;
+			return IIO_VAL_INT;
+		case IIO_PRESSURE:
+			*val = 0;
+			*val2 = 1000;
+			return IIO_VAL_INT_PLUS_MICRO;
+		default:
+			return -EINVAL;
+		}
 	}
 
 	return -EINVAL;
@@ -218,11 +230,13 @@ static struct ms5611_chip_info chip_info_tbl[] = {
 static const struct iio_chan_spec ms5611_channels[] = {
 	{
 		.type = IIO_PRESSURE,
-		.info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED),
+		.info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED) |
+			BIT(IIO_CHAN_INFO_SCALE),
 	},
 	{
 		.type = IIO_TEMP,
-		.info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED),
+		.info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED) |
+			BIT(IIO_CHAN_INFO_SCALE),
 	}
 };
 
-- 
2.5.0

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread


Thread

[PATCH 0/2] ms5611: Add triggered buffer support Daniel Baluta <daniel.baluta@intel.com> - 2016-01-26 16:50 +0100
  [PATCH 2/2] iio: pressure: ms5611: Add triggered buffer support Daniel Baluta <daniel.baluta@intel.com> - 2016-01-26 16:50 +0100
  [PATCH 1/2] iio: pressure: ms5611: Add IIO_CHAN_INFO_SCALE to mask Daniel Baluta <daniel.baluta@intel.com> - 2016-01-26 16:50 +0100

csiph-web