[media] gspca-stv06xx: Simplify register writes by avoiding special data structures

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/stv06xx/stv06xx.h b/drivers/media/video/gspca/stv06xx/stv06xx.h
index e0f63c5..d270a59 100644 (file)
--- a/drivers/media/video/gspca/stv06xx/stv06xx.h
+++ b/drivers/media/video/gspca/stv06xx/stv06xx.h
@@ -37,6 +37,8 @@
 
 #define STV_ISOC_ENDPOINT_ADDR         0x81
 
+#define STV_R                           0x0509
+
 #define STV_REG23                      0x0423
 
 /* Control registers of the STV0600 ASIC */
@@ -61,7 +63,9 @@
 
 /* Refers to the CIF 352x288 and QCIF 176x144 */
 /* 1: 288 lines, 2: 144 lines */
-#define STV_Y_CTRL                     0x15c3
+#define STV_Y_CTRL                     0x15c3
+
+#define STV_RESET                       0x1620
 
 /* 0xa: 352 columns, 0x6: 176 columns */
 #define STV_X_CTRL                     0x1680

diff --git a/drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h b/drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h
index 7fe3587..c7615c2 100644 (file)
--- a/drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h
+++ b/drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h
@@ -216,22 +216,23 @@ struct stv_init {
        u8 len;
 };
 
-static const u8 x1500[] = {    /* 0x1500 - 0x150f */
-       0x0b, 0xa7, 0xb7, 0x00, 0x00
-};
-
-static const u8 x1536[] = {    /* 0x1536 - 0x153b */
-       0x02, 0x00, 0x60, 0x01, 0x20, 0x01
-};
-
 static const struct stv_init stv_bridge_init[] = {
        /* This reg is written twice. Some kind of reset? */
-       {NULL,  0x1620, 0x80},
-       {NULL,  0x1620, 0x00},
-       {NULL,  0x1443, 0x00},
-       {NULL,  0x1423, 0x04},
-       {x1500, 0x1500, ARRAY_SIZE(x1500)},
-       {x1536, 0x1536, ARRAY_SIZE(x1536)},
+       {NULL, STV_RESET, 0x80},
+       {NULL, STV_RESET, 0x00},
+       {NULL, STV_SCAN_RATE, 0x00},
+       {NULL, STV_I2C_FLUSH, 0x04},
+       {NULL, STV_REG00, 0x0b},
+       {NULL, STV_REG01, 0xa7},
+       {NULL, STV_REG02, 0xb7},
+       {NULL, STV_REG03, 0x00},
+       {NULL, STV_REG04, 0x00},
+       {NULL, 0x1536, 0x02},
+       {NULL, 0x1537, 0x00},
+       {NULL, 0x1538, 0x60},
+       {NULL, 0x1539, 0x01},
+       {NULL, 0x153a, 0x20},
+       {NULL, 0x153b, 0x01},
 };
 
 static const u8 vv6410_sensor_init[][2] = {
@@ -240,7 +241,7 @@ static const u8 vv6410_sensor_init[][2] = {
        {VV6410_SETUP0,         VV6410_LOW_POWER_MODE},
        /* Use shuffled read-out mode */
        {VV6410_SETUP1,         BIT(6)},
-       /* All modes to 1 */
+       /* All modes to 1, FST, Fast QCK, Free running QCK, Free running LST, FST will qualify visible pixels */
        {VV6410_FGMODES,        BIT(6) | BIT(4) | BIT(2) | BIT(0)},
        {VV6410_PINMAPPING,     0x00},
        /* Pre-clock generator divide off */