Extend the Vishay VCNL4000/4010/4020/4200 driver to work with the VCNL4040
chip.
Changes since V1:
Separated byte vs word bug fix.
Separated device tree hooks.
Separated devicetree binding patches.
Angus Ainslie (Purism) (5):
iio: light: vcnl4000 use word writes instead of byte writes
iio: light: vcnl4000 add devicetree hooks
dt-bindings: iio: light: add vcnl4000 devicetree bindings
iio: light: vcnl4000 add support for the VCNL4040 proximity and light
sensor
dt-bindings: iio: light: add vcnl4040 devicetree bindings
.../bindings/iio/light/vcnl4000.txt | 24 ++++++
drivers/iio/light/vcnl4000.c | 77 ++++++++++++++++---
2 files changed, 91 insertions(+), 10 deletions(-)
create mode 100644 Documentation/devicetree/bindings/iio/light/vcnl4000.txt
--
2.17.1
Add an of_match table for devicetree probing.
Signed-off-by: Angus Ainslie (Purism) <[email protected]>
---
drivers/iio/light/vcnl4000.c | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/drivers/iio/light/vcnl4000.c b/drivers/iio/light/vcnl4000.c
index 5295330b65e2..836fa97b4e0c 100644
--- a/drivers/iio/light/vcnl4000.c
+++ b/drivers/iio/light/vcnl4000.c
@@ -363,9 +363,31 @@ static int vcnl4000_probe(struct i2c_client *client,
return devm_iio_device_register(&client->dev, indio_dev);
}
+static const struct of_device_id vcnl_4000_of_match[] = {
+ {
+ .compatible = "vishay,vcnl4000",
+ .data = "VCNL4000",
+ },
+ {
+ .compatible = "vishay,vcnl4010",
+ .data = "VCNL4010",
+ },
+ {
+ .compatible = "vishay,vcnl4010",
+ .data = "VCNL4020",
+ },
+ {
+ .compatible = "vishay,vcnl4200",
+ .data = "VCNL4200",
+ },
+ {},
+};
+MODULE_DEVICE_TABLE(of, vcnl4000_of_match);
+
static struct i2c_driver vcnl4000_driver = {
.driver = {
.name = VCNL4000_DRV_NAME,
+ .of_match_table = of_match_ptr(vcnl_4000_of_match),
},
.probe = vcnl4000_probe,
.id_table = vcnl4000_id,
--
2.17.1
Document the vishay VCNL4040 devicetree bindings.
Signed-off-by: Angus Ainslie (Purism) <[email protected]>
---
Documentation/devicetree/bindings/iio/light/vcnl4000.txt | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/iio/light/vcnl4000.txt b/Documentation/devicetree/bindings/iio/light/vcnl4000.txt
index 4a9d558a412a..955af4555c90 100644
--- a/Documentation/devicetree/bindings/iio/light/vcnl4000.txt
+++ b/Documentation/devicetree/bindings/iio/light/vcnl4000.txt
@@ -1,6 +1,6 @@
VISHAY VCNL4000 - Ambient Light and proximity sensor
-This driver supports the VCNL4000/10/20 and VCNL4200 chips
+This driver supports the VCNL4000/10/20/40 and VCNL4200 chips
Required properties:
@@ -8,11 +8,13 @@ Required properties:
vishay,vcnl4000
vishay,vcnl4010
vishay,vcnl4020
+ vishay,vcnl4040
vishay,vcnl4200
-reg: I2C address of the sensor, should be one from below based on the model:
0x13
0x51
+ 0x60
Example:
--
2.17.1
The VCNL4040 is almost identical to the VCNL4200 as far as register
layout goes but just need to check a different ID register location.
Signed-off-by: Angus Ainslie (Purism) <[email protected]>
---
drivers/iio/light/vcnl4000.c | 51 ++++++++++++++++++++++++++++++------
1 file changed, 43 insertions(+), 8 deletions(-)
diff --git a/drivers/iio/light/vcnl4000.c b/drivers/iio/light/vcnl4000.c
index 836fa97b4e0c..d354143e5529 100644
--- a/drivers/iio/light/vcnl4000.c
+++ b/drivers/iio/light/vcnl4000.c
@@ -1,8 +1,9 @@
/*
- * vcnl4000.c - Support for Vishay VCNL4000/4010/4020/4200 combined ambient
+ * vcnl4000.c - Support for Vishay VCNL4000/4010/4020/4040/4200 combined ambient
* light and proximity sensor
*
* Copyright 2012 Peter Meerwald <[email protected]>
+ * Copyright 2019 Pursim SPC
*
* This file is subject to the terms and conditions of version 2 of
* the GNU General Public License. See the file COPYING in the main
@@ -10,13 +11,14 @@
*
* IIO driver for:
* VCNL4000/10/20 (7-bit I2C slave address 0x13)
+ * VCNL4040 (7-bit I2C slave address 0x60)
* VCNL4200 (7-bit I2C slave address 0x51)
*
* TODO:
* allow to adjust IR current
* proximity threshold and event handling
* periodic ALS/proximity measurement (VCNL4010/20)
- * interrupts (VCNL4010/20, VCNL4200)
+ * interrupts (VCNL4010/20/40, VCNL4200)
*/
#include <linux/module.h>
@@ -30,6 +32,7 @@
#define VCNL4000_DRV_NAME "vcnl4000"
#define VCNL4000_PROD_ID 0x01
#define VCNL4010_PROD_ID 0x02 /* for VCNL4020, VCNL4010 */
+#define VCNL4040_PROD_ID 0x86
#define VCNL4200_PROD_ID 0x58
#define VCNL4000_COMMAND 0x80 /* Command register */
@@ -49,6 +52,8 @@
#define VCNL4200_AL_DATA 0x09 /* Ambient light data */
#define VCNL4200_DEV_ID 0x0e /* Device ID, slave address and version */
+#define VCNL4040_DEV_ID 0x0c /* Device ID and version */
+
/* Bit masks for COMMAND register */
#define VCNL4000_AL_RDY BIT(6) /* ALS data ready? */
#define VCNL4000_PS_RDY BIT(5) /* proximity data ready? */
@@ -58,6 +63,7 @@
enum vcnl4000_device_ids {
VCNL4000,
VCNL4010,
+ VCNL4040,
VCNL4200,
};
@@ -90,6 +96,7 @@ static const struct i2c_device_id vcnl4000_id[] = {
{ "vcnl4000", VCNL4000 },
{ "vcnl4010", VCNL4010 },
{ "vcnl4020", VCNL4010 },
+ { "vcnl4040", VCNL4040 },
{ "vcnl4200", VCNL4200 },
{ }
};
@@ -128,14 +135,26 @@ static int vcnl4000_init(struct vcnl4000_data *data)
static int vcnl4200_init(struct vcnl4000_data *data)
{
- int ret;
+ int ret, id;
ret = i2c_smbus_read_word_data(data->client, VCNL4200_DEV_ID);
if (ret < 0)
return ret;
- if ((ret & 0xff) != VCNL4200_PROD_ID)
- return -ENODEV;
+ id = ret & 0xff;
+
+ if (id != VCNL4200_PROD_ID) {
+ ret = i2c_smbus_read_word_data(data->client, VCNL4040_DEV_ID);
+ if (ret < 0)
+ return ret;
+
+ id = ret & 0xff;
+
+ if (id != VCNL4040_PROD_ID)
+ return -ENODEV;
+ }
+
+ dev_dbg(&data->client->dev, "device id 0x%x", id);
data->rev = (ret >> 8) & 0xf;
@@ -150,9 +169,19 @@ static int vcnl4200_init(struct vcnl4000_data *data)
data->al_scale = 24000;
data->vcnl4200_al.reg = VCNL4200_AL_DATA;
data->vcnl4200_ps.reg = VCNL4200_PS_DATA;
- /* Integration time is 50ms, but the experiments show 54ms in total. */
- data->vcnl4200_al.sampling_rate = ktime_set(0, 54000 * 1000);
- data->vcnl4200_ps.sampling_rate = ktime_set(0, 4200 * 1000);
+ switch (id) {
+ case VCNL4200_PROD_ID:
+ /* Integration time is 50ms, but the experiments */
+ /* show 54ms in total. */
+ data->vcnl4200_al.sampling_rate = ktime_set(0, 54000 * 1000);
+ data->vcnl4200_ps.sampling_rate = ktime_set(0, 4200 * 1000);
+ break;
+ case VCNL4040_PROD_ID:
+ /* Integration time is 80ms, add 10ms. */
+ data->vcnl4200_al.sampling_rate = ktime_set(0, 100000 * 1000);
+ data->vcnl4200_ps.sampling_rate = ktime_set(0, 100000 * 1000);
+ break;
+ }
data->vcnl4200_al.last_measurement = ktime_set(0, 0);
data->vcnl4200_ps.last_measurement = ktime_set(0, 0);
mutex_init(&data->vcnl4200_al.lock);
@@ -271,6 +300,12 @@ static const struct vcnl4000_chip_spec vcnl4000_chip_spec_cfg[] = {
.measure_light = vcnl4000_measure_light,
.measure_proximity = vcnl4000_measure_proximity,
},
+ [VCNL4040] = {
+ .prod = "VCNL4040",
+ .init = vcnl4200_init,
+ .measure_light = vcnl4200_measure_light,
+ .measure_proximity = vcnl4200_measure_proximity,
+ },
[VCNL4200] = {
.prod = "VCNL4200",
.init = vcnl4200_init,
--
2.17.1
Document the vishay VCNL4000 devicetree bindings.
Signed-off-by: Angus Ainslie (Purism) <[email protected]>
---
.../bindings/iio/light/vcnl4000.txt | 22 +++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 Documentation/devicetree/bindings/iio/light/vcnl4000.txt
diff --git a/Documentation/devicetree/bindings/iio/light/vcnl4000.txt b/Documentation/devicetree/bindings/iio/light/vcnl4000.txt
new file mode 100644
index 000000000000..4a9d558a412a
--- /dev/null
+++ b/Documentation/devicetree/bindings/iio/light/vcnl4000.txt
@@ -0,0 +1,22 @@
+VISHAY VCNL4000 - Ambient Light and proximity sensor
+
+This driver supports the VCNL4000/10/20 and VCNL4200 chips
+
+Required properties:
+
+ -compatible: must be one of :
+ vishay,vcnl4000
+ vishay,vcnl4010
+ vishay,vcnl4020
+ vishay,vcnl4200
+
+ -reg: I2C address of the sensor, should be one from below based on the model:
+ 0x13
+ 0x51
+
+Example:
+
+light-sensor@51 {
+ compatible = "vishay,vcnl4200";
+ reg = <0x51>;
+};
--
2.17.1
The VCNL4200 datasheet says that word read and writes should be used
to access the registers.
Signed-off-by: Angus Ainslie (Purism) <[email protected]>
---
drivers/iio/light/vcnl4000.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/iio/light/vcnl4000.c b/drivers/iio/light/vcnl4000.c
index 04fd0d4b6f19..5295330b65e2 100644
--- a/drivers/iio/light/vcnl4000.c
+++ b/drivers/iio/light/vcnl4000.c
@@ -140,10 +140,10 @@ static int vcnl4200_init(struct vcnl4000_data *data)
data->rev = (ret >> 8) & 0xf;
/* Set defaults and enable both channels */
- ret = i2c_smbus_write_byte_data(data->client, VCNL4200_AL_CONF, 0x00);
+ ret = i2c_smbus_write_word_data(data->client, VCNL4200_AL_CONF, 0x00);
if (ret < 0)
return ret;
- ret = i2c_smbus_write_byte_data(data->client, VCNL4200_PS_CONF1, 0x00);
+ ret = i2c_smbus_write_word_data(data->client, VCNL4200_PS_CONF1, 0x00);
if (ret < 0)
return ret;
--
2.17.1
Hi Angus,
On Sun, 17 Mar 2019 08:47:58 -0700
"Angus Ainslie (Purism)" <[email protected]> wrote:
> The VCNL4200 datasheet says that word read and writes should be used
> to access the registers.
>
> Signed-off-by: Angus Ainslie (Purism) <[email protected]>
> ---
> drivers/iio/light/vcnl4000.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/iio/light/vcnl4000.c b/drivers/iio/light/vcnl4000.c
> index 04fd0d4b6f19..5295330b65e2 100644
> --- a/drivers/iio/light/vcnl4000.c
> +++ b/drivers/iio/light/vcnl4000.c
> @@ -140,10 +140,10 @@ static int vcnl4200_init(struct vcnl4000_data *data)
> data->rev = (ret >> 8) & 0xf;
>
> /* Set defaults and enable both channels */
> - ret = i2c_smbus_write_byte_data(data->client, VCNL4200_AL_CONF, 0x00);
> + ret = i2c_smbus_write_word_data(data->client, VCNL4200_AL_CONF, 0x00);
minor note: the 0x00 looks like a byte. 0 or 0x0000 would be slightly better?
The same below.
> if (ret < 0)
> return ret;
> - ret = i2c_smbus_write_byte_data(data->client, VCNL4200_PS_CONF1, 0x00);
> + ret = i2c_smbus_write_word_data(data->client, VCNL4200_PS_CONF1, 0x00);
The VCNL4200_PS_CONF1 definition is a bit misleading with word write. Because
PS_CONF1 is only a low byte of command code 0x03. The high byte of 0x03 is
PS_CONF2. I would rename it.
> if (ret < 0)
> return ret;
Anyway, the main point is that I've tested this patch on VCNL4200 and it
works, so:
Tested-by: Tomas Novotny <[email protected]>
T.
Hi Tomas,
On 2019-03-20 07:53, Tomas Novotny wrote:
> Hi Angus,
>
> On Sun, 17 Mar 2019 08:47:58 -0700
> "Angus Ainslie (Purism)" <[email protected]> wrote:
>
>> The VCNL4200 datasheet says that word read and writes should be used
>> to access the registers.
>>
>> Signed-off-by: Angus Ainslie (Purism) <[email protected]>
>> ---
>> drivers/iio/light/vcnl4000.c | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/iio/light/vcnl4000.c
>> b/drivers/iio/light/vcnl4000.c
>> index 04fd0d4b6f19..5295330b65e2 100644
>> --- a/drivers/iio/light/vcnl4000.c
>> +++ b/drivers/iio/light/vcnl4000.c
>> @@ -140,10 +140,10 @@ static int vcnl4200_init(struct vcnl4000_data
>> *data)
>> data->rev = (ret >> 8) & 0xf;
>>
>> /* Set defaults and enable both channels */
>> - ret = i2c_smbus_write_byte_data(data->client, VCNL4200_AL_CONF,
>> 0x00);
>> + ret = i2c_smbus_write_word_data(data->client, VCNL4200_AL_CONF,
>> 0x00);
>
> minor note: the 0x00 looks like a byte. 0 or 0x0000 would be slightly
> better?
> The same below.
>
>> if (ret < 0)
>> return ret;
>> - ret = i2c_smbus_write_byte_data(data->client, VCNL4200_PS_CONF1,
>> 0x00);
>> + ret = i2c_smbus_write_word_data(data->client, VCNL4200_PS_CONF1,
>> 0x00);
>
> The VCNL4200_PS_CONF1 definition is a bit misleading with word write.
> Because
> PS_CONF1 is only a low byte of command code 0x03. The high byte of 0x03
> is
> PS_CONF2. I would rename it.
>
As far as a base address for the register that is correct based on the
names in the datasheet. I suppose I could add something like:
#define VCNL4200_PS_CONF VCNL4200_PS_CONF1
and change the reference here if you think that would be more clear.
>> if (ret < 0)
>> return ret;
>
> Anyway, the main point is that I've tested this patch on VCNL4200 and
> it
> works, so:
> Tested-by: Tomas Novotny <[email protected]>
>
> T.
Thanks for testing it
Angus
Hi Angus,
On Wed, 20 Mar 2019 13:21:58 -0700
Angus Ainslie <[email protected]> wrote:
> Hi Tomas,
>
> On 2019-03-20 07:53, Tomas Novotny wrote:
> > Hi Angus,
> >
> > On Sun, 17 Mar 2019 08:47:58 -0700
> > "Angus Ainslie (Purism)" <[email protected]> wrote:
> >
> >> The VCNL4200 datasheet says that word read and writes should be used
> >> to access the registers.
> >>
> >> Signed-off-by: Angus Ainslie (Purism) <[email protected]>
> >> ---
> >> drivers/iio/light/vcnl4000.c | 4 ++--
> >> 1 file changed, 2 insertions(+), 2 deletions(-)
> >>
> >> diff --git a/drivers/iio/light/vcnl4000.c
> >> b/drivers/iio/light/vcnl4000.c
> >> index 04fd0d4b6f19..5295330b65e2 100644
> >> --- a/drivers/iio/light/vcnl4000.c
> >> +++ b/drivers/iio/light/vcnl4000.c
> >> @@ -140,10 +140,10 @@ static int vcnl4200_init(struct vcnl4000_data
> >> *data)
> >> data->rev = (ret >> 8) & 0xf;
> >>
> >> /* Set defaults and enable both channels */
> >> - ret = i2c_smbus_write_byte_data(data->client, VCNL4200_AL_CONF,
> >> 0x00);
> >> + ret = i2c_smbus_write_word_data(data->client, VCNL4200_AL_CONF,
> >> 0x00);
> >
> > minor note: the 0x00 looks like a byte. 0 or 0x0000 would be slightly
> > better?
> > The same below.
> >
> >> if (ret < 0)
> >> return ret;
> >> - ret = i2c_smbus_write_byte_data(data->client, VCNL4200_PS_CONF1,
> >> 0x00);
> >> + ret = i2c_smbus_write_word_data(data->client, VCNL4200_PS_CONF1,
> >> 0x00);
> >
> > The VCNL4200_PS_CONF1 definition is a bit misleading with word write.
> > Because
> > PS_CONF1 is only a low byte of command code 0x03. The high byte of 0x03
> > is
> > PS_CONF2. I would rename it.
> >
>
> As far as a base address for the register that is correct based on the
> names in the datasheet. I suppose I could add something like:
>
> #define VCNL4200_PS_CONF VCNL4200_PS_CONF1
>
> and change the reference here if you think that would be more clear.
to be honest, I don't know the best practice. As there is also PS_CONF3, I
was thinking about PS_CONF1_2, but thinking again, your current name is good
enough maybe.
Tomas
> >> if (ret < 0)
> >> return ret;
> >
> > Anyway, the main point is that I've tested this patch on VCNL4200 and
> > it
> > works, so:
> > Tested-by: Tomas Novotny <[email protected]>
> >
> > T.
>
> Thanks for testing it
> Angus
>