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

Groups > linux.kernel > #1734630

[PATCH 4/4] iio: light: vl6180: Correct ALS scale for non-default gain/integration time

Show all headers | View raw

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

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

Thread

[PATCH 0/4] iio: light: vl6180: Several fixes and enhancements Stefan Brüns <stefan.bruens@rwth-aachen.de> - 2017-09-19 05:20 +0200
  [PATCH 3/4] iio: light: vl6180: Cleanup als_gain lookup, avoid register readback Stefan Brüns <stefan.bruens@rwth-aachen.de> - 2017-09-19 05:20 +0200
    Re: [PATCH 3/4] iio: light: vl6180: Cleanup als_gain lookup, avoid  register readback Peter Meerwald-Stadler <pmeerw@pmeerw.net> - 2017-09-19 08:20 +0200
  [PATCH 2/4] iio: light: vl6180: Avoid readback of integration time register Stefan Brüns <stefan.bruens@rwth-aachen.de> - 2017-09-19 05:20 +0200
    Re: [PATCH 2/4] iio: light: vl6180: Avoid readback of integration  time register Jonathan Cameron <jic23@kernel.org> - 2017-09-24 17:40 +0200
  [PATCH 4/4] iio: light: vl6180: Correct ALS scale for non-default gain/integration time Stefan Brüns <stefan.bruens@rwth-aachen.de> - 2017-09-19 05:20 +0200
  Re: [PATCH 0/4] iio: light: vl6180: Several fixes and enhancements Jonathan Cameron <jic23@kernel.org> - 2017-09-24 17:50 +0200

csiph-web