Merge branch 'cpus4096-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-omap-h63xx.git] / drivers / media / video / gspca / m5602 / m5602_s5k4aa.h

diff --git a/drivers/media/video/gspca/m5602/m5602_s5k4aa.h b/drivers/media/video/gspca/m5602/m5602_s5k4aa.h
index 151c6f530e58a6dab0d671b63cd480a383185662..1f88b0d040c4649eea1f14cae040f6930da9cf4d 100644 (file)
--- a/drivers/media/video/gspca/m5602/m5602_s5k4aa.h
+++ b/drivers/media/video/gspca/m5602/m5602_s5k4aa.h
@@ -41,11 +41,10 @@
 #define S5K4AA_WINDOW_HEIGHT_LO                0x09
 #define S5K4AA_WINDOW_WIDTH_HI         0x0a
 #define S5K4AA_WINDOW_WIDTH_LO         0x0b
-#define S5K4AA_GLOBAL_GAIN__           0x0f /* Only a guess ATM !!! */
-#define S5K4AA_H_BLANK_HI__            0x1d /* Only a guess ATM !!! sync lost
-                                               if too low, reduces frame rate
-                                               if too high */
-#define S5K4AA_H_BLANK_LO__            0x1e /* Only a guess ATM !!! */
+#define S5K4AA_GLOBAL_GAIN__           0x0f
+/* sync lost, if too low, reduces frame rate if too high */
+#define S5K4AA_H_BLANK_HI__            0x1d
+#define S5K4AA_H_BLANK_LO__            0x1e
 #define S5K4AA_EXPOSURE_HI             0x17
 #define S5K4AA_EXPOSURE_LO             0x18
 #define S5K4AA_GAIN_1                  0x1f /* (digital?) gain : 5 bits */
@@ -68,13 +67,6 @@ int s5k4aa_probe(struct sd *sd);
 int s5k4aa_init(struct sd *sd);
 int s5k4aa_power_down(struct sd *sd);
 
-void s5k4aa_dump_registers(struct sd *sd);
-
-int s5k4aa_read_sensor(struct sd *sd, const u8 address,
-                      u8 *i2c_data, const u8 len);
-int s5k4aa_write_sensor(struct sd *sd, const u8 address,
-                       u8 *i2c_data, const u8 len);
-
 int s5k4aa_get_exposure(struct gspca_dev *gspca_dev, __s32 *val);
 int s5k4aa_set_exposure(struct gspca_dev *gspca_dev, __s32 val);
 int s5k4aa_get_vflip(struct gspca_dev *gspca_dev, __s32 *val);
@@ -89,9 +81,8 @@ static struct m5602_sensor s5k4aa = {
        .probe = s5k4aa_probe,
        .init = s5k4aa_init,
        .power_down = s5k4aa_power_down,
-       .read_sensor = s5k4aa_read_sensor,
-       .write_sensor = s5k4aa_write_sensor,
        .i2c_slave_id = 0x5a,
+       .i2c_regW = 2,
        .nctrls = 4,
        .ctrls = {
        {