summaryrefslogtreecommitdiffstats
path: root/drivers/iio
diff options
context:
space:
mode:
authorStefan Brüns <stefan.bruens@rwth-aachen.de>2017-09-24 23:59:20 +0200
committerJonathan Cameron <Jonathan.Cameron@huawei.com>2017-10-09 20:50:21 +0100
commit3525d7cfb740243f0d9fab19288b2f89f715aba5 (patch)
tree06911b0ae286e5dd5e6572819d3105cf679f8a22 /drivers/iio
parente794bf6751a0376a459ae1659a1646652b198cad (diff)
downloadlinux-3525d7cfb740243f0d9fab19288b2f89f715aba5.tar.bz2
iio: light: vl6180: Correct ALS scale for non-default gain/integration time
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> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Diffstat (limited to 'drivers/iio')
-rw-r--r--drivers/iio/light/vl6180.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/iio/light/vl6180.c b/drivers/iio/light/vl6180.c
index 561a993a2723..192c77ef3608 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;