From: "Mylène Josserand" <mylene.josserand@bootlin.com>
To: peda@axentia.se, jic23@kernel.org, knaack.h@gmx.de,
lars@metafoo.de, pmeerw@pmeerw.net, robh+dt@kernel.org,
mark.rutland@arm.com
Cc: linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org,
devicetree@vger.kernel.org, thomas.petazzoni@bootlin.com,
mylene.josserand@bootlin.com
Subject: [PATCH v1 2/3] iio: afe: rescale: Add support of CHAN_INFO_PROCESSED
Date: Tue, 11 Jun 2019 11:56:58 +0200 [thread overview]
Message-ID: <20190611095659.29845-3-mylene.josserand@bootlin.com> (raw)
In-Reply-To: <20190611095659.29845-1-mylene.josserand@bootlin.com>
Add the support of the CHAN_INFO_PROCESSED to have directly
the processed value (raw * scale). It will be exported as
in_voltage0_input in sysfs.
Signed-off-by: Mylène Josserand <mylene.josserand@bootlin.com>
---
drivers/iio/afe/iio-rescale.c | 42 +++++++++++++++++++++++++++++++++++++++++-
1 file changed, 41 insertions(+), 1 deletion(-)
diff --git a/drivers/iio/afe/iio-rescale.c b/drivers/iio/afe/iio-rescale.c
index 3e689d6eb501..2275571fff64 100644
--- a/drivers/iio/afe/iio-rescale.c
+++ b/drivers/iio/afe/iio-rescale.c
@@ -63,14 +63,54 @@ static int rescale_convert_scale(struct rescale *rescale, int *val, int *val2)
}
}
+static int rescale_convert_processed(struct rescale *rescale, int raw,
+ int *val, int *val2)
+{
+ unsigned long long tmp, scaled;
+ int ret;
+
+ ret = rescale_convert_scale(rescale, val, val2);
+ switch (ret) {
+ case IIO_VAL_FRACTIONAL:
+ tmp = div_s64((s64)*val * 1000000000LL, *val2);
+ scaled = tmp * raw;
+ *val = (int)div_s64_rem(scaled, 1000000000, val2);
+ return ret;
+ case IIO_VAL_INT:
+ return IIO_VAL_FRACTIONAL;
+ case IIO_VAL_FRACTIONAL_LOG2:
+ tmp = shift_right((s64)*val * 1000000000LL, *val2);
+ scaled = tmp * raw;
+ *val = (int)div_s64_rem(scaled, 1000000000LL, val2);
+ return ret;
+ default:
+ return -EOPNOTSUPP;
+ }
+}
+
static int rescale_read_raw(struct iio_dev *indio_dev,
struct iio_chan_spec const *chan,
int *val, int *val2, long mask)
{
struct rescale *rescale = iio_priv(indio_dev);
+ unsigned int raw;
int ret;
switch (mask) {
+ case IIO_CHAN_INFO_PROCESSED:
+ /* Read the raw value and the scale */
+ ret = iio_read_channel_raw(rescale->source, &raw);
+ if (!ret)
+ return ret;
+ ret = iio_read_channel_scale(rescale->source, val, val2);
+ if (!ret)
+ return ret;
+ /* Process the correct value with raw * scale */
+ ret = rescale_convert_processed(rescale, raw, val, val2);
+ if (!ret)
+ return ret;
+ return IIO_VAL_INT;
+
case IIO_CHAN_INFO_RAW:
return iio_read_channel_raw(rescale->source, val);
@@ -145,7 +185,7 @@ static int rescale_configure_channel(struct device *dev,
}
chan->info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
- BIT(IIO_CHAN_INFO_SCALE);
+ BIT(IIO_CHAN_INFO_SCALE) | BIT(IIO_CHAN_INFO_PROCESSED);
if (iio_channel_has_available(schan, IIO_CHAN_INFO_RAW))
chan->info_mask_separate_available |= BIT(IIO_CHAN_INFO_RAW);
--
2.11.0
next prev parent reply other threads:[~2019-06-11 9:57 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-11 9:56 [PATCH v1 0/3] iio: afe: rescale: Add INFO_PROCESSED support Mylène Josserand
2019-06-11 9:56 ` [PATCH v1 1/3] iio: afe: rescale: Move scale conversion to new function Mylène Josserand
2019-06-11 11:03 ` Peter Rosin
2019-06-11 9:56 ` Mylène Josserand [this message]
2019-06-11 9:56 ` [PATCH v1 3/3] dt-bindings: iio: afe: Add hwmon example Mylène Josserand
2019-06-11 11:14 ` Peter Rosin
2019-06-11 11:02 ` [PATCH v1 0/3] iio: afe: rescale: Add INFO_PROCESSED support Peter Rosin
2019-06-11 11:44 ` 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=20190611095659.29845-3-mylene.josserand@bootlin.com \
--to=mylene.josserand@bootlin.com \
--cc=devicetree@vger.kernel.org \
--cc=jic23@kernel.org \
--cc=knaack.h@gmx.de \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=peda@axentia.se \
--cc=pmeerw@pmeerw.net \
--cc=robh+dt@kernel.org \
--cc=thomas.petazzoni@bootlin.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 NNTP newsgroup(s).