staging: iio: tsl2x7x: use auto increment I2C protocol

The hardware supports 16-bit ALS and proximity readings, however the
datasheet recommends using the I2C auto increment protocol so that the
correct high and low bytes are read even if the integration cycle ends
between reading the lower and upper registers.

Signed-off-by: Brian Masney <masneyb@onstation.org>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/staging/iio/light/tsl2x7x.c b/drivers/staging/iio/light/tsl2x7x.c
index 77a81d7..8530bcc 100644 (file)
--- a/drivers/staging/iio/light/tsl2x7x.c
+++ b/drivers/staging/iio/light/tsl2x7x.c
@@ -80,6 +80,8 @@
 /* tsl2X7X cmd reg masks */
 #define TSL2X7X_CMD_REG                        0x80
 #define TSL2X7X_CMD_SPL_FN             0x60
+#define TSL2X7X_CMD_REPEAT_PROTO       0x00
+#define TSL2X7X_CMD_AUTOINC_PROTO      0x20
 
 #define TSL2X7X_CMD_PROX_INT_CLR       0X05
 #define TSL2X7X_CMD_ALS_INT_CLR                0x06
@@ -320,6 +322,55 @@ static int tsl2x7x_write_control_reg(struct tsl2X7X_chip *chip, u8 data)
        return ret;
 }
 
+static int tsl2x7x_read_autoinc_regs(struct tsl2X7X_chip *chip, int lower_reg,
+                                    int upper_reg)
+{
+       u8 buf[2];
+       int ret;
+
+       ret = i2c_smbus_write_byte(chip->client,
+                                  TSL2X7X_CMD_REG | TSL2X7X_CMD_AUTOINC_PROTO |
+                                  lower_reg);
+       if (ret < 0) {
+               dev_err(&chip->client->dev,
+                       "%s: failed to enable auto increment protocol: %d\n",
+                       __func__, ret);
+               return ret;
+       }
+
+       ret = i2c_smbus_read_byte_data(chip->client,
+                                      TSL2X7X_CMD_REG | lower_reg);
+       if (ret < 0) {
+               dev_err(&chip->client->dev,
+                       "%s: failed to read from register %x: %d\n", __func__,
+                       lower_reg, ret);
+               return ret;
+       }
+       buf[0] = ret;
+
+       ret = i2c_smbus_read_byte_data(chip->client,
+                                      TSL2X7X_CMD_REG | upper_reg);
+       if (ret < 0) {
+               dev_err(&chip->client->dev,
+                       "%s: failed to read from register %x: %d\n", __func__,
+                       upper_reg, ret);
+               return ret;
+       }
+       buf[1] = ret;
+
+       ret = i2c_smbus_write_byte(chip->client,
+                                  TSL2X7X_CMD_REG | TSL2X7X_CMD_REPEAT_PROTO |
+                                  lower_reg);
+       if (ret < 0) {
+               dev_err(&chip->client->dev,
+                       "%s: failed to enable repeated byte protocol: %d\n",
+                       __func__, ret);
+               return ret;
+       }
+
+       return le16_to_cpup((const __le16 *)&buf[0]);
+}
+
 /**
  * tsl2x7x_get_lux() - Reads and calculates current lux value.
  * @indio_dev: pointer to IIO device
@@ -340,9 +391,8 @@ static int tsl2x7x_get_lux(struct iio_dev *indio_dev)
        struct tsl2X7X_chip *chip = iio_priv(indio_dev);
        struct tsl2x7x_lux *p;
        u32 lux, ratio;
-       int i, ret;
        u64 lux64;
-       u8 buf[4];
+       int ret;
 
        mutex_lock(&chip->als_mutex);
 
@@ -366,23 +416,17 @@ static int tsl2x7x_get_lux(struct iio_dev *indio_dev)
                goto out_unlock;
        }
 
-       for (i = 0; i < 4; i++) {
-               int reg = TSL2X7X_CMD_REG | (TSL2X7X_ALS_CHAN0LO + i);
-
-               ret = i2c_smbus_read_byte_data(chip->client, reg);
-               if (ret < 0) {
-                       dev_err(&chip->client->dev,
-                               "%s: failed to read from register %x: %d\n",
-                               __func__, reg, ret);
-                       goto out_unlock;
-               }
-
-               buf[i] = ret;
-       }
+       ret = tsl2x7x_read_autoinc_regs(chip, TSL2X7X_ALS_CHAN0LO,
+                                       TSL2X7X_ALS_CHAN0HI);
+       if (ret < 0)
+               goto out_unlock;
+       chip->als_cur_info.als_ch0 = ret;
 
-       /* extract ALS/lux data */
-       chip->als_cur_info.als_ch0 = le16_to_cpup((const __le16 *)&buf[0]);
-       chip->als_cur_info.als_ch1 = le16_to_cpup((const __le16 *)&buf[2]);
+       ret = tsl2x7x_read_autoinc_regs(chip, TSL2X7X_ALS_CHAN1LO,
+                                       TSL2X7X_ALS_CHAN1HI);
+       if (ret < 0)
+               goto out_unlock;
+       chip->als_cur_info.als_ch1 = ret;
 
        if (chip->als_cur_info.als_ch0 >= chip->als_saturation ||
            chip->als_cur_info.als_ch1 >= chip->als_saturation) {
@@ -456,10 +500,8 @@ out_unlock:
  */
 static int tsl2x7x_get_prox(struct iio_dev *indio_dev)
 {
-       int i;
-       int ret;
-       u8 chdata[2];
        struct tsl2X7X_chip *chip = iio_priv(indio_dev);
+       int ret;
 
        mutex_lock(&chip->prox_mutex);
 
@@ -490,18 +532,10 @@ static int tsl2x7x_get_prox(struct iio_dev *indio_dev)
                break;
        }
 
-       for (i = 0; i < 2; i++) {
-               int reg = TSL2X7X_CMD_REG | (TSL2X7X_PRX_LO + i);
-
-               ret = i2c_smbus_read_byte_data(chip->client, reg);
-               if (ret < 0)
-                       goto prox_poll_err;
-
-               chdata[i] = ret;
-       }
-
-       chip->prox_data = le16_to_cpup((const __le16 *)&chdata[0]);
-       ret = chip->prox_data;
+       ret = tsl2x7x_read_autoinc_regs(chip, TSL2X7X_PRX_LO, TSL2X7X_PRX_HI);
+       if (ret < 0)
+               goto prox_poll_err;
+       chip->prox_data = ret;
 
 prox_poll_err:
        mutex_unlock(&chip->prox_mutex);