V4L/DVB (10015): gspca - m5602: Add initial read sensor implementation

Signed-off-by: Erik Andrén <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/gspca/m5602/m5602_bridge.h b/drivers/media/video/gspca/m5602/m5602_bridge.h
index 51376e2a902d786cc5656e2af889af330039276b..a3f3b7a0c7e75e59f8262751d9370d48cf0ccf79 100644 (file)
--- a/drivers/media/video/gspca/m5602/m5602_bridge.h
+++ b/drivers/media/video/gspca/m5602/m5602_bridge.h
@@ -136,4 +136,7 @@ int m5602_write_bridge(
 int m5602_write_sensor(struct sd *sd, const u8 address,
                       u8 *i2c_data, const u8 len);
 
+int m5602_read_sensor(struct sd *sd, const u8 address,
+                     u8 *i2c_data, const u8 len);
+
 #endif

diff --git a/drivers/media/video/gspca/m5602/m5602_core.c b/drivers/media/video/gspca/m5602/m5602_core.c
index d69e3c4ff97de00d25474602346a45feb9ab617a..aaba42058181469e6b6f23d5e3c6d32080b9f935 100644 (file)
--- a/drivers/media/video/gspca/m5602/m5602_core.c
+++ b/drivers/media/video/gspca/m5602/m5602_core.c
@@ -80,6 +80,42 @@ int m5602_write_bridge(struct sd *sd, u8 address, u8 i2c_data)
        return (err < 0) ? err : 0;
 }
 
+int m5602_read_sensor(struct sd *sd, const u8 address,
+                      u8 *i2c_data, const u8 len)
+{
+       int err, i;
+
+       do {
+               err = m5602_read_bridge(sd, M5602_XB_I2C_STATUS, i2c_data);
+       } while ((*i2c_data & I2C_BUSY) && !err);
+
+       err = m5602_write_bridge(sd, M5602_XB_I2C_DEV_ADDR,
+                                sd->sensor->i2c_slave_id);
+       if (err < 0)
+               goto out;
+
+       err = m5602_write_bridge(sd, M5602_XB_I2C_REG_ADDR, address);
+       if (err < 0)
+               goto out;
+
+       err = m5602_write_bridge(sd, M5602_XB_I2C_CTRL, 0x10 + len);
+       if (err < 0)
+               goto out;
+
+       err = m5602_write_bridge(sd, M5602_XB_I2C_CTRL, 0x08);
+       if (err < 0)
+               goto out;
+
+       for (i = 0; (i < len) && !err; i++) {
+               err = m5602_read_bridge(sd, M5602_XB_I2C_DATA, &(i2c_data[i]));
+
+               PDEBUG(D_CONF, "Reading sensor register "
+                              "0x%x containing 0x%x ", address, *i2c_data);
+       }
+out:
+       return err;
+}
+
 int m5602_write_sensor(struct sd *sd, const u8 address,
                        u8 *i2c_data, const u8 len)
 {