It will be easier to configure various device registers.
No functional change.
Signed-off-by: Tomas Novotny <tomas@xxxxxxxxxx>
---
drivers/iio/light/Kconfig | 1 +
drivers/iio/light/vcnl4000.c | 59 ++++++++++++++++++++++++++++++--------------
2 files changed, 42 insertions(+), 18 deletions(-)
diff --git a/drivers/iio/light/Kconfig b/drivers/iio/light/Kconfig
index 4a1a883dc061..ae2b9dafb9f6 100644
--- a/drivers/iio/light/Kconfig
+++ b/drivers/iio/light/Kconfig
@@ -475,6 +475,7 @@ config US5182D
config VCNL4000
tristate "VCNL4000/4010/4020/4200 combined ALS and proximity sensor"
depends on I2C
+ select REGMAP_I2C
help
Say Y here if you want to build a driver for the Vishay VCNL4000,
VCNL4010, VCNL4020, VCNL4200 combined ambient light and proximity
diff --git a/drivers/iio/light/vcnl4000.c b/drivers/iio/light/vcnl4000.c
index e5b00a6611ac..9f673e89084a 100644
--- a/drivers/iio/light/vcnl4000.c
+++ b/drivers/iio/light/vcnl4000.c
@@ -22,6 +22,7 @@
#include <linux/i2c.h>
#include <linux/err.h>
#include <linux/delay.h>
+#include <linux/regmap.h>
#include <linux/iio/iio.h>
#include <linux/iio/sysfs.h>
@@ -73,6 +74,7 @@ struct vcnl4200_channel {
struct vcnl4000_data {
struct i2c_client *client;
+ struct regmap *regmap;
enum vcnl4000_device_ids id;
int rev;
int al_scale;
@@ -84,6 +86,7 @@ struct vcnl4000_data {
struct vcnl4000_chip_spec {
const char *prod;
+ const struct regmap_config *regmap_config;
int (*init)(struct vcnl4000_data *data);
int (*measure_light)(struct vcnl4000_data *data, int *val);
int (*measure_proximity)(struct vcnl4000_data *data, int *val);
@@ -99,15 +102,27 @@ static const struct i2c_device_id vcnl4000_id[] = {
};
MODULE_DEVICE_TABLE(i2c, vcnl4000_id);
+static const struct regmap_config vcnl4000_regmap_config = {
+ .reg_bits = 8,
+ .val_bits = 8,
+};
+
+static const struct regmap_config vcnl4200_regmap_config = {
+ .reg_bits = 8,
+ .val_bits = 16,
+ .val_format_endian = REGMAP_ENDIAN_LITTLE,
+};
+
static int vcnl4000_init(struct vcnl4000_data *data)
{
int ret, prod_id;
+ unsigned int val;
- ret = i2c_smbus_read_byte_data(data->client, VCNL4000_PROD_REV);
+ ret = regmap_read(data->regmap, VCNL4000_PROD_REV, &val);
if (ret < 0)
return ret;
- prod_id = ret >> 4;
+ prod_id = val >> 4;
switch (prod_id) {
case VCNL4000_PROD_ID:
if (data->id != VCNL4000)
@@ -123,7 +138,7 @@ static int vcnl4000_init(struct vcnl4000_data *data)
return -ENODEV;
}
- data->rev = ret & 0xf;
+ data->rev = val & 0xf;
data->al_scale = 250000;
mutex_init(&data->vcnl4000_lock);
@@ -133,19 +148,20 @@ static int vcnl4000_init(struct vcnl4000_data *data)
static int vcnl4200_init(struct vcnl4000_data *data)
{
int ret, id;
+ unsigned int val;
- ret = i2c_smbus_read_word_data(data->client, VCNL4200_DEV_ID);
+ ret = regmap_read(data->regmap, VCNL4200_DEV_ID, &val);
if (ret < 0)
return ret;
- id = ret & 0xff;
+ id = val & 0xff;
if (id != VCNL4200_PROD_ID) {
- ret = i2c_smbus_read_word_data(data->client, VCNL4040_DEV_ID);
+ ret = regmap_read(data->regmap, VCNL4040_DEV_ID, &val);
if (ret < 0)
return ret;
- id = ret & 0xff;
+ id = val & 0xff;
if (id != VCNL4040_PROD_ID)
return -ENODEV;
@@ -156,10 +172,10 @@ static int vcnl4200_init(struct vcnl4000_data *data)
data->rev = (ret >> 8) & 0xf;
/* Set defaults and enable both channels */
- ret = i2c_smbus_write_word_data(data->client, VCNL4200_AL_CONF, 0);
+ ret = regmap_write(data->regmap, VCNL4200_AL_CONF, 0);
if (ret < 0)
return ret;
- ret = i2c_smbus_write_word_data(data->client, VCNL4200_PS_CONF1, 0);
+ ret = regmap_write(data->regmap, VCNL4200_PS_CONF1, 0);
if (ret < 0)
return ret;
@@ -193,22 +209,22 @@ static int vcnl4000_measure(struct vcnl4000_data *data, u8 req_mask,
u8 rdy_mask, u8 data_reg, int *val)
{
int tries = 20;
+ unsigned int status;
__be16 buf;
int ret;
mutex_lock(&data->vcnl4000_lock);
- ret = i2c_smbus_write_byte_data(data->client, VCNL4000_COMMAND,
- req_mask);
+ ret = regmap_write(data->regmap, VCNL4000_COMMAND, req_mask);
if (ret < 0)
goto fail;
/* wait for data to become ready */
while (tries--) {
- ret = i2c_smbus_read_byte_data(data->client, VCNL4000_COMMAND);
+ ret = regmap_read(data->regmap, VCNL4000_COMMAND, &status);
if (ret < 0)
goto fail;
- if (ret & rdy_mask)
+ if (status & rdy_mask)
break;
msleep(20); /* measurement takes up to 100 ms */
}
@@ -220,8 +236,8 @@ static int vcnl4000_measure(struct vcnl4000_data *data, u8 req_mask,
goto fail;
}
- ret = i2c_smbus_read_i2c_block_data(data->client,
- data_reg, sizeof(buf), (u8 *) &buf);
+ ret = regmap_bulk_read(data->regmap,
+ data_reg, (u8 *) &buf, sizeof(buf));
if (ret < 0)
goto fail;
@@ -253,12 +269,10 @@ static int vcnl4200_measure(struct vcnl4000_data *data,
mutex_unlock(&chan->lock);
- ret = i2c_smbus_read_word_data(data->client, chan->reg);
+ ret = regmap_read(data->regmap, chan->reg, val);
if (ret < 0)
return ret;
- *val = ret;
-
return 0;
}
@@ -289,24 +303,28 @@ static int vcnl4200_measure_proximity(struct vcnl4000_data *data, int *val)
static const struct vcnl4000_chip_spec vcnl4000_chip_spec_cfg[] = {
[VCNL4000] = {
.prod = "VCNL4000",
+ .regmap_config = &vcnl4000_regmap_config,
.init = vcnl4000_init,
.measure_light = vcnl4000_measure_light,
.measure_proximity = vcnl4000_measure_proximity,
},
[VCNL4010] = {
.prod = "VCNL4010/4020",
+ .regmap_config = &vcnl4000_regmap_config,
.init = vcnl4000_init,
.measure_light = vcnl4000_measure_light,
.measure_proximity = vcnl4000_measure_proximity,
},
[VCNL4040] = {
.prod = "VCNL4040",
+ .regmap_config = &vcnl4200_regmap_config,
.init = vcnl4200_init,
.measure_light = vcnl4200_measure_light,
.measure_proximity = vcnl4200_measure_proximity,
},
[VCNL4200] = {
.prod = "VCNL4200",
+ .regmap_config = &vcnl4200_regmap_config,
.init = vcnl4200_init,
.measure_light = vcnl4200_measure_light,
.measure_proximity = vcnl4200_measure_proximity,
@@ -380,6 +398,11 @@ static int vcnl4000_probe(struct i2c_client *client,
data->id = id->driver_data;
data->chip_spec = &vcnl4000_chip_spec_cfg[data->id];
+ data->regmap = devm_regmap_init_i2c(client,
+ data->chip_spec->regmap_config);
+ if (IS_ERR(data->regmap))
+ return PTR_ERR(data->regmap);
+
ret = data->chip_spec->init(data);
if (ret < 0)
return ret;
--
2.16.4
