diff options
| author | Stefan Brüns <stefan.bruens@rwth-aachen.de> | 2017-09-24 23:59:20 +0200 |
|---|---|---|
| committer | Ziyuan Xu <xzy.xu@rock-chips.com> | 2018-05-19 10:50:09 +0800 |
| commit | ade6b9cc4edd357c91d3dc4ba2e935ec8c42c099 (patch) | |
| tree | 1f00bd011a929a0c12800b5806646f125509ac0b /drivers/iio | |
| parent | 990f320ea5217e14341b1d530bc3b63e33dcaa2b (diff) | |
UPSTREAM: 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.
Change-Id: I969d50d317f20d05d26db74d497dba790b5a7c25
Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
(cherry picked from commit 3525d7cfb740243f0d9fab19288b2f89f715aba5)
Diffstat (limited to 'drivers/iio')
| -rw-r--r-- | drivers/iio/light/vl6180.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/iio/light/vl6180.c b/drivers/iio/light/vl6180.c index 49e9f92cd116..67f8beb84fc3 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; |