All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Stefan Brüns" <stefan.bruens@rwth-aachen.de>
To: <linux-iio@vger.kernel.org>
Cc: <linux-kernel@vger.kernel.org>,
	Jonathan Cameron <jic23@kernel.org>,
	Hartmut Knaack <knaack.h@gmx.de>,
	Lars-Peter Clausen <lars@metafoo.de>,
	Peter Meerwald-Stadler <pmeerw@pmeerw.net>
Subject: [PATCH 4/4] iio: light: vl6180: Correct ALS scale for non-default gain/integration time
Date: Tue, 19 Sep 2017 05:11:44 +0200	[thread overview]
Message-ID: <20170919031144.4968-5-stefan.bruens@rwth-aachen.de> (raw)
In-Reply-To: <20170919031144.4968-1-stefan.bruens@rwth-aachen.de>

The reported scale was only correct for the default settings of 100 ms
integration time and gain 1.

This aligns the reported scale with the behaviour of any other IIO driver
and the documented ABI, but may require userspace changes if someone uses
non-default settings.

Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
---
 drivers/iio/light/vl6180.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/iio/light/vl6180.c b/drivers/iio/light/vl6180.c
index fcd8ef511bdc..4f7c36d3df5f 100644
--- a/drivers/iio/light/vl6180.c
+++ b/drivers/iio/light/vl6180.c
@@ -315,9 +315,12 @@ static int vl6180_read_raw(struct iio_dev *indio_dev,
 	case IIO_CHAN_INFO_SCALE:
 		switch (chan->type) {
 		case IIO_LIGHT:
-			*val = 0; /* one ALS count is 0.32 Lux */
-			*val2 = 320000;
-			break;
+			/* one ALS count is 0.32 Lux @ gain 1, IT 100 ms */
+			*val = 32000; /* 0.32 * 1000 * 100 */
+			*val2 = data->als_gain_milli * data->als_it_ms;
+
+			return IIO_VAL_FRACTIONAL;
+
 		case IIO_DISTANCE:
 			*val = 0; /* sensor reports mm, scale to meter */
 			*val2 = 1000;
-- 
2.14.1

  parent reply	other threads:[~2017-09-19  3:12 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-09-19  3:11 [PATCH 0/4] iio: light: vl6180: Several fixes and enhancements Stefan Brüns
2017-09-19  3:11 ` [PATCH 1/4] iio: light: vl6180: Move range check to integration time setter, cleanup Stefan Brüns
2017-09-19  6:17   ` Peter Meerwald-Stadler
2017-09-24 15:34     ` Jonathan Cameron
2017-09-19  3:11 ` [PATCH 2/4] iio: light: vl6180: Avoid readback of integration time register Stefan Brüns
2017-09-24 15:36   ` Jonathan Cameron
2017-09-19  3:11 ` [PATCH 3/4] iio: light: vl6180: Cleanup als_gain lookup, avoid register readback Stefan Brüns
2017-09-19  6:17   ` Peter Meerwald-Stadler
2017-09-19  3:11 ` Stefan Brüns [this message]
2017-09-24 15:40 ` [PATCH 0/4] iio: light: vl6180: Several fixes and enhancements 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=20170919031144.4968-5-stefan.bruens@rwth-aachen.de \
    --to=stefan.bruens@rwth-aachen.de \
    --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=pmeerw@pmeerw.net \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.