Commit bc80573e authored by Guido Günther's avatar Guido Günther Committed by Greg Kroah-Hartman

iio: light: vcnl4000: Fix scale for vcnl4040

According to the data sheet the ambient sensor's scale is 0.12 lux/step
(not 0.024 lux/step as used by vcnl4200) when the integration time is
80ms. The integration time is currently hardcoded in the driver to that
value.

See p. 8 in https://www.vishay.com/docs/84307/designingvcnl4040.pdf

Fixes: 5a441aad ("iio: light: vcnl4000 add support for the VCNL4040 proximity and light sensor")
Signed-off-by: default avatarGuido Günther <agx@sigxcpu.org>
Reviewed-by: default avatarMarco Felsch <m.felsch@pengutronix.de>
Cc: <Stable@vger.kernel.org>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 883f6165
...@@ -163,7 +163,6 @@ static int vcnl4200_init(struct vcnl4000_data *data) ...@@ -163,7 +163,6 @@ static int vcnl4200_init(struct vcnl4000_data *data)
if (ret < 0) if (ret < 0)
return ret; return ret;
data->al_scale = 24000;
data->vcnl4200_al.reg = VCNL4200_AL_DATA; data->vcnl4200_al.reg = VCNL4200_AL_DATA;
data->vcnl4200_ps.reg = VCNL4200_PS_DATA; data->vcnl4200_ps.reg = VCNL4200_PS_DATA;
switch (id) { switch (id) {
...@@ -172,11 +171,13 @@ static int vcnl4200_init(struct vcnl4000_data *data) ...@@ -172,11 +171,13 @@ static int vcnl4200_init(struct vcnl4000_data *data)
/* show 54ms in total. */ /* show 54ms in total. */
data->vcnl4200_al.sampling_rate = ktime_set(0, 54000 * 1000); data->vcnl4200_al.sampling_rate = ktime_set(0, 54000 * 1000);
data->vcnl4200_ps.sampling_rate = ktime_set(0, 4200 * 1000); data->vcnl4200_ps.sampling_rate = ktime_set(0, 4200 * 1000);
data->al_scale = 24000;
break; break;
case VCNL4040_PROD_ID: case VCNL4040_PROD_ID:
/* Integration time is 80ms, add 10ms. */ /* Integration time is 80ms, add 10ms. */
data->vcnl4200_al.sampling_rate = ktime_set(0, 100000 * 1000); data->vcnl4200_al.sampling_rate = ktime_set(0, 100000 * 1000);
data->vcnl4200_ps.sampling_rate = ktime_set(0, 100000 * 1000); data->vcnl4200_ps.sampling_rate = ktime_set(0, 100000 * 1000);
data->al_scale = 120000;
break; break;
} }
data->vcnl4200_al.last_measurement = ktime_set(0, 0); data->vcnl4200_al.last_measurement = ktime_set(0, 0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment