V4L/DVB (12230): gspca - t613: Change tas5130a init sequences.

Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/gspca/t613.c b/drivers/media/video/gspca/t613.c
index 404214b..1d321c3 100644 (file)
--- a/drivers/media/video/gspca/t613.c
+++ b/drivers/media/video/gspca/t613.c
@@ -264,6 +264,10 @@ static const struct v4l2_pix_format vga_mode_t16[] = {
 
 /* sensor specific data */
 struct additional_sensor_data {
+       const u8 n3[6];
+       const u8 *n4, n4sz;
+       const u8 reg80, reg8e;
+       const u8 nset8[6];
        const u8 data1[10];
        const u8 data2[9];
        const u8 data3[9];
@@ -272,14 +276,55 @@ struct additional_sensor_data {
        const u8 stream[4];
 };
 
+static const u8 n4_om6802[] = {
+       0x09, 0x01, 0x12, 0x04, 0x66, 0x8a, 0x80, 0x3c,
+       0x81, 0x22, 0x84, 0x50, 0x8a, 0x78, 0x8b, 0x68,
+       0x8c, 0x88, 0x8e, 0x33, 0x8f, 0x24, 0xaa, 0xb1,
+       0xa2, 0x60, 0xa5, 0x30, 0xa6, 0x3a, 0xa8, 0xe8,
+       0xae, 0x05, 0xb1, 0x00, 0xbb, 0x04, 0xbc, 0x48,
+       0xbe, 0x36, 0xc6, 0x88, 0xe9, 0x00, 0xc5, 0xc0,
+       0x65, 0x0a, 0xbb, 0x86, 0xaf, 0x58, 0xb0, 0x68,
+       0x87, 0x40, 0x89, 0x2b, 0x8d, 0xff, 0x83, 0x40,
+       0xac, 0x84, 0xad, 0x86, 0xaf, 0x46
+};
+static const u8 n4_other[] = {
+       0x66, 0x00, 0x7f, 0x00, 0x80, 0xac, 0x81, 0x69,
+       0x84, 0x40, 0x85, 0x70, 0x86, 0x20, 0x8a, 0x68,
+       0x8b, 0x58, 0x8c, 0x88, 0x8d, 0xff, 0x8e, 0xb8,
+       0x8f, 0x28, 0xa2, 0x60, 0xa5, 0x40, 0xa8, 0xa8,
+       0xac, 0x84, 0xad, 0x84, 0xae, 0x24, 0xaf, 0x56,
+       0xb0, 0x68, 0xb1, 0x00, 0xb2, 0x88, 0xbb, 0xc5,
+       0xbc, 0x4a, 0xbe, 0x36, 0xc2, 0x88, 0xc5, 0xc0,
+       0xc6, 0xda, 0xe9, 0x26, 0xeb, 0x00
+};
+static const u8 n4_tas5130a[] = {
+       0x80, 0x3c, 0x81, 0x68, 0x83, 0xa0, 0x84, 0x20,
+       0x8a, 0x68, 0x8b, 0x58, 0x8c, 0x88, 0x8e, 0xb4,
+       0x8f, 0x24, 0xa1, 0xb1, 0xa2, 0x30, 0xa5, 0x10,
+       0xa6, 0x4a, 0xae, 0x03, 0xb1, 0x44, 0xb2, 0x08,
+       0xb7, 0x06, 0xb9, 0xe7, 0xbb, 0xc4, 0xbc, 0x4a,
+       0xbe, 0x36, 0xbf, 0xff, 0xc2, 0x88, 0xc5, 0xc8,
+       0xc6, 0xda
+};
+
 static const struct additional_sensor_data sensor_data[] = {
-    {                          /* OM6802 */
+    {                          /* 0: OM6802 */
+       .n3 =
+               {0x61, 0x68, 0x65, 0x0a, 0x60, 0x04},
+       .n4 = n4_om6802,
+       .n4sz = sizeof n4_om6802,
+       .reg80 = 0x3c,
+       .reg8e = 0x33,
+       .nset8 = {0xa8, 0xf0, 0xc6, 0x88, 0xc0, 0x00},
        .data1 =
                {0xc2, 0x28, 0x0f, 0x22, 0xcd, 0x27, 0x2c, 0x06,
                 0xb3, 0xfc},
        .data2 =
                {0x80, 0xff, 0xff, 0x80, 0xff, 0xff, 0x80, 0xff,
                 0xff},
+       .data3 =
+               {0x80, 0xff, 0xff, 0x80, 0xff, 0xff, 0x80, 0xff,
+                0xff},
        .data4 =        /*Freq (50/60Hz). Splitted for test purpose */
                {0x66, 0xca, 0xa8, 0xf0},
        .data5 =        /* this could be removed later */
@@ -287,13 +332,23 @@ static const struct additional_sensor_data sensor_data[] = {
        .stream =
                {0x0b, 0x04, 0x0a, 0x78},
     },
-    {                          /* OTHER */
+    {                          /* 1: OTHER */
+       .n3 =
+               {0x61, 0xc2, 0x65, 0x88, 0x60, 0x00},
+       .n4 = n4_other,
+       .n4sz = sizeof n4_other,
+       .reg80 = 0xac,
+       .reg8e = 0xb8,
+       .nset8 = {0xa8, 0xa8, 0xc6, 0xda, 0xc0, 0x00},
        .data1 =
                {0xc1, 0x48, 0x04, 0x1b, 0xca, 0x2e, 0x33, 0x3a,
                 0xe8, 0xfc},
        .data2 =
                {0x4e, 0x9c, 0xec, 0x40, 0x80, 0xc0, 0x48, 0x96,
                 0xd9},
+       .data3 =
+               {0x4e, 0x9c, 0xec, 0x40, 0x80, 0xc0, 0x48, 0x96,
+                0xd9},
        .data4 =
                {0x66, 0x00, 0xa8, 0xa8},
        .data5 =
@@ -301,13 +356,23 @@ static const struct additional_sensor_data sensor_data[] = {
        .stream =
                {0x0b, 0x04, 0x0a, 0x00},
     },
-    {                          /* TAS5130A */
+    {                          /* 2: TAS5130A */
+       .n3 =
+               {0x61, 0xc2, 0x65, 0x0d, 0x60, 0x08},
+       .n4 = n4_tas5130a,
+       .n4sz = sizeof n4_tas5130a,
+       .reg80 = 0x3c,
+       .reg8e = 0xb4,
+       .nset8 = {0xa8, 0xf0, 0xc6, 0xda, 0xc0, 0x00},
        .data1 =
                {0xbb, 0x28, 0x10, 0x10, 0xbb, 0x28, 0x1e, 0x27,
                 0xc8, 0xfc},
        .data2 =
                {0x60, 0xa8, 0xe0, 0x60, 0xa8, 0xe0, 0x60, 0xa8,
                 0xe0},
+       .data3 =
+               {0x60, 0xa8, 0xe0, 0x60, 0xa8, 0xe0, 0x60, 0xa8,
+                0xe0},
        .data4 =        /* Freq (50/60Hz). Splitted for test purpose */
                {0x66, 0x00, 0xa8, 0xe8},
        .data5 =
@@ -364,7 +429,7 @@ static const u8 gamma_table[GAMMA_MAX][17] = {
        {0x00, 0x18, 0x2b, 0x44, 0x60, 0x70, 0x80, 0x8e,        /* 10 */
         0x9c, 0xaa, 0xb7, 0xc4, 0xd0, 0xd8, 0xe2, 0xf0,
         0xff},
-       {0x00, 0x1a, 0x34, 0x52, 0x66, 0x7e, 0x8D, 0x9B,        /* 11 */
+       {0x00, 0x1a, 0x34, 0x52, 0x66, 0x7e, 0x8d, 0x9b,        /* 11 */
         0xa8, 0xb4, 0xc0, 0xcb, 0xd6, 0xe1, 0xeb, 0xf5,
         0xff},
        {0x00, 0x3f, 0x5a, 0x6e, 0x7f, 0x8e, 0x9c, 0xa8,        /* 12 */
@@ -385,8 +450,6 @@ static const u8 tas5130a_sensor_init[][8] = {
        {0x62, 0x08, 0x63, 0x70, 0x64, 0x1d, 0x60, 0x09},
        {0x62, 0x20, 0x63, 0x01, 0x64, 0x02, 0x60, 0x09},
        {0x62, 0x07, 0x63, 0x03, 0x64, 0x00, 0x60, 0x09},
-       {0x62, 0x07, 0x63, 0x03, 0x64, 0x00, 0x60, 0x09},
-       {},
 };
 
 static u8 sensor_reset[] = {0x61, 0x68, 0x62, 0xff, 0x60, 0x07};
@@ -633,10 +696,10 @@ static int sd_init(struct gspca_dev *gspca_dev)
         * but wont hurt anyway, and can help someone with similar webcam
         * to see the initial parameters.*/
        struct sd *sd = (struct sd *) gspca_dev;
+       const struct additional_sensor_data *sensor;
        int i;
        u16 sensor_id;
        u8 test_byte = 0;
-       u16 reg80, reg8e;
 
        static const u8 read_indexs[] =
                { 0x0a, 0x0b, 0x66, 0x80, 0x81, 0x8e, 0x8f, 0xa5,
@@ -645,37 +708,6 @@ static int sd_init(struct gspca_dev *gspca_dev)
                        {0x08, 0x03, 0x09, 0x03, 0x12, 0x04};
        static const u8 n2[] =
                        {0x08, 0x00};
-       static const u8 n3[6] =
-                       {0x61, 0x68, 0x65, 0x0a, 0x60, 0x04};
-       static const u8 n3_other[6] =
-                       {0x61, 0xc2, 0x65, 0x88, 0x60, 0x00};
-       static const u8 n4[] =
-               {0x09, 0x01, 0x12, 0x04, 0x66, 0x8a, 0x80, 0x3c,
-                0x81, 0x22, 0x84, 0x50, 0x8a, 0x78, 0x8b, 0x68,
-                0x8c, 0x88, 0x8e, 0x33, 0x8f, 0x24, 0xaa, 0xb1,
-                0xa2, 0x60, 0xa5, 0x30, 0xa6, 0x3a, 0xa8, 0xe8,
-                0xae, 0x05, 0xb1, 0x00, 0xbb, 0x04, 0xbc, 0x48,
-                0xbe, 0x36, 0xc6, 0x88, 0xe9, 0x00, 0xc5, 0xc0,
-                0x65, 0x0a, 0xbb, 0x86, 0xaf, 0x58, 0xb0, 0x68,
-                0x87, 0x40, 0x89, 0x2b, 0x8d, 0xff, 0x83, 0x40,
-                0xac, 0x84, 0xad, 0x86, 0xaf, 0x46};
-       static const u8 n4_other[] =
-               {0x66, 0x00, 0x7f, 0x00, 0x80, 0xac, 0x81, 0x69,
-                0x84, 0x40, 0x85, 0x70, 0x86, 0x20, 0x8a, 0x68,
-                0x8b, 0x58, 0x8c, 0x88, 0x8d, 0xff, 0x8e, 0xb8,
-                0x8f, 0x28, 0xa2, 0x60, 0xa5, 0x40, 0xa8, 0xa8,
-                0xac, 0x84, 0xad, 0x84, 0xae, 0x24, 0xaf, 0x56,
-                0xb0, 0x68, 0xb1, 0x00, 0xb2, 0x88, 0xbb, 0xc5,
-                0xbc, 0x4a, 0xbe, 0x36, 0xc2, 0x88, 0xc5, 0xc0,
-                0xc6, 0xda, 0xe9, 0x26, 0xeb, 0x00};
-       static const u8 nset8[6] =
-                       { 0xa8, 0xf0, 0xc6, 0x88, 0xc0, 0x00 };
-       static const u8 nset8_other[6] =
-                       { 0xa8, 0xa8, 0xc6, 0xda, 0xc0, 0x00 };
-       static const u8 nset9[4] =
-                       { 0x0b, 0x04, 0x0a, 0x78 };
-       static const u8 nset9_other[4] =
-                       { 0x0b, 0x04, 0x0a, 0x00 };
 
        sensor_id = (reg_r(gspca_dev, 0x06) << 8)
                        | reg_r(gspca_dev, 0x07);
@@ -709,8 +741,7 @@ static int sd_init(struct gspca_dev *gspca_dev)
                }
                if (i < 0) {
                        err("Bad sensor reset %02x", test_byte);
-/*                     return -EIO; */
-/*fixme: test - continue */
+                       return -EIO;
                }
                reg_w_buf(gspca_dev, n2, sizeof n2);
        }
@@ -723,31 +754,17 @@ static int sd_init(struct gspca_dev *gspca_dev)
                i++;
        }
 
-       if (sd->sensor != SENSOR_OTHER) {
-               reg_w_buf(gspca_dev, n3, sizeof n3);
-               reg_w_buf(gspca_dev, n4, sizeof n4);
-               reg_r(gspca_dev, 0x0080);
-               reg_w(gspca_dev, 0x2c80);
-               reg80 = 0x3880;
-               reg8e = 0x338e;
-       } else {
-               reg_w_buf(gspca_dev, n3_other, sizeof n3_other);
-               reg_w_buf(gspca_dev, n4_other, sizeof n4_other);
-               sd->gamma = 5;
-               reg80 = 0xac80;
-               reg8e = 0xb88e;
-       }
+       sensor = &sensor_data[sd->sensor];
+       reg_w_buf(gspca_dev, sensor->n3, sizeof sensor->n3);
+       reg_w_buf(gspca_dev, sensor->n4, sensor->n4sz);
 
-       reg_w_ixbuf(gspca_dev, 0xd0, sensor_data[sd->sensor].data1,
-                       sizeof sensor_data[sd->sensor].data1);
-       reg_w_ixbuf(gspca_dev, 0xc7, sensor_data[sd->sensor].data2,
-                       sizeof sensor_data[sd->sensor].data2);
-       reg_w_ixbuf(gspca_dev, 0xe0, sensor_data[sd->sensor].data2,
-                       sizeof sensor_data[sd->sensor].data2);
+       reg_w_ixbuf(gspca_dev, 0xd0, sensor->data1, sizeof sensor->data1);
+       reg_w_ixbuf(gspca_dev, 0xc7, sensor->data2, sizeof sensor->data2);
+       reg_w_ixbuf(gspca_dev, 0xe0, sensor->data3, sizeof sensor->data3);
 
-       reg_w(gspca_dev, reg80);
-       reg_w(gspca_dev, reg80);
-       reg_w(gspca_dev, reg8e);
+       reg_w(gspca_dev, (sensor->reg80 << 8) + 0x80);
+       reg_w(gspca_dev, (sensor->reg80 << 8) + 0x80);
+       reg_w(gspca_dev, (sensor->reg8e << 8) + 0x8e);
 
        setbrightness(gspca_dev);
        setcontrast(gspca_dev);
@@ -760,25 +777,14 @@ static int sd_init(struct gspca_dev *gspca_dev)
        reg_w(gspca_dev, 0x2088);
        reg_w(gspca_dev, 0x2089);
 
-       reg_w_buf(gspca_dev, sensor_data[sd->sensor].data4,
-                       sizeof sensor_data[sd->sensor].data4);
-       reg_w_buf(gspca_dev, sensor_data[sd->sensor].data5,
-                       sizeof sensor_data[sd->sensor].data5);
-       if (sd->sensor != SENSOR_OTHER) {
-               reg_w_buf(gspca_dev, nset8, sizeof nset8);
-               reg_w_buf(gspca_dev, nset9, sizeof nset9);
-               reg_w(gspca_dev, 0x2880);
-       } else {
-               reg_w_buf(gspca_dev, nset8_other, sizeof nset8_other);
-               reg_w_buf(gspca_dev, nset9_other, sizeof nset9_other);
-       }
+       reg_w_buf(gspca_dev, sensor->data4, sizeof sensor->data4);
+       reg_w_buf(gspca_dev, sensor->data5, sizeof sensor->data5);
+       reg_w_buf(gspca_dev, sensor->nset8, sizeof sensor->nset8);
+       reg_w_buf(gspca_dev, sensor->stream, sizeof sensor->stream);
 
-       reg_w_ixbuf(gspca_dev, 0xd0, sensor_data[sd->sensor].data1,
-                       sizeof sensor_data[sd->sensor].data1);
-       reg_w_ixbuf(gspca_dev, 0xc7, sensor_data[sd->sensor].data2,
-                       sizeof sensor_data[sd->sensor].data2);
-       reg_w_ixbuf(gspca_dev, 0xe0, sensor_data[sd->sensor].data2,
-                       sizeof sensor_data[sd->sensor].data2);
+       reg_w_ixbuf(gspca_dev, 0xd0, sensor->data1, sizeof sensor->data1);
+       reg_w_ixbuf(gspca_dev, 0xc7, sensor->data2, sizeof sensor->data2);
+       reg_w_ixbuf(gspca_dev, 0xe0, sensor->data3, sizeof sensor->data3);
 
        return 0;
 }
@@ -828,7 +834,6 @@ static void setlightfreq(struct gspca_dev *gspca_dev)
  * i added some module parameters for test with some users */
 static void poll_sensor(struct gspca_dev *gspca_dev)
 {
-       struct sd *sd = (struct sd *) gspca_dev;
        static const u8 poll1[] =
                {0x67, 0x05, 0x68, 0x81, 0x69, 0x80, 0x6a, 0x82,
                 0x6b, 0x68, 0x6c, 0x69, 0x72, 0xd9, 0x73, 0x34,
@@ -844,24 +849,23 @@ static void poll_sensor(struct gspca_dev *gspca_dev)
                 0xa1, 0xb1, 0xda, 0x6b, 0xdb, 0x98, 0xdf, 0x0c,
                 0xc2, 0x80, 0xc3, 0x10};
 
-       if (sd->sensor == SENSOR_OM6802) {
-               PDEBUG(D_STREAM, "[Sensor requires polling]");
-               reg_w_buf(gspca_dev, poll1, sizeof poll1);
-               reg_w_buf(gspca_dev, poll2, sizeof poll2);
-               reg_w_buf(gspca_dev, poll3, sizeof poll3);
-               reg_w_buf(gspca_dev, poll4, sizeof poll4);
-       }
+       PDEBUG(D_STREAM, "[Sensor requires polling]");
+       reg_w_buf(gspca_dev, poll1, sizeof poll1);
+       reg_w_buf(gspca_dev, poll2, sizeof poll2);
+       reg_w_buf(gspca_dev, poll3, sizeof poll3);
+       reg_w_buf(gspca_dev, poll4, sizeof poll4);
 }
 
 static int sd_start(struct gspca_dev *gspca_dev)
 {
        struct sd *sd = (struct sd *) gspca_dev;
+       const struct additional_sensor_data *sensor;
        int i, mode;
        u8 t2[] = { 0x07, 0x00, 0x0d, 0x60, 0x0e, 0x80 };
        static const u8 t3[] =
                { 0x07, 0x00, 0x88, 0x02, 0x06, 0x00, 0xe7, 0x01 };
 
-       mode = gspca_dev->cam.cam_mode[(int) gspca_dev->curr_mode]. priv;
+       mode = gspca_dev->cam.cam_mode[gspca_dev->curr_mode].priv;
        switch (mode) {
        case 0:         /* 640x480 (0x00) */
                break;
@@ -889,34 +893,33 @@ static int sd_start(struct gspca_dev *gspca_dev)
        default:
 /*     case SENSOR_TAS5130A: */
                i = 0;
-               while (tas5130a_sensor_init[i][0] != 0) {
+               for (;;) {
                        reg_w_buf(gspca_dev, tas5130a_sensor_init[i],
                                         sizeof tas5130a_sensor_init[0]);
+                       if (i >= ARRAY_SIZE(tas5130a_sensor_init) - 1)
+                               break;
                        i++;
                }
                reg_w(gspca_dev, 0x3c80);
                /* just in case and to keep sync with logs (for mine) */
-               reg_w_buf(gspca_dev, tas5130a_sensor_init[3],
+               reg_w_buf(gspca_dev, tas5130a_sensor_init[i],
                                 sizeof tas5130a_sensor_init[0]);
                reg_w(gspca_dev, 0x3c80);
                break;
        }
-       reg_w_buf(gspca_dev, sensor_data[sd->sensor].data4,
-                       sizeof sensor_data[sd->sensor].data4);
+       sensor = &sensor_data[sd->sensor];
+       reg_w_buf(gspca_dev, sensor->data4, sizeof sensor->data4);
        reg_r(gspca_dev, 0x0012);
        reg_w_buf(gspca_dev, t2, sizeof t2);
        reg_w_ixbuf(gspca_dev, 0xb3, t3, sizeof t3);
        reg_w(gspca_dev, 0x0013);
        msleep(15);
-       reg_w_buf(gspca_dev, sensor_data[sd->sensor].stream,
-                       sizeof sensor_data[sd->sensor].stream);
-       poll_sensor(gspca_dev);
+       reg_w_buf(gspca_dev, sensor->stream, sizeof sensor->stream);
+       reg_w_buf(gspca_dev, sensor->stream, sizeof sensor->stream);
+
+       if (sd->sensor == SENSOR_OM6802)
+               poll_sensor(gspca_dev);
 
-       /* restart on each start, just in case, sometimes regs goes wrong
-        * when using controls from app */
-       setbrightness(gspca_dev);
-       setcontrast(gspca_dev);
-       setcolors(gspca_dev);
        return 0;
 }
 
@@ -926,10 +929,9 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
 
        reg_w_buf(gspca_dev, sensor_data[sd->sensor].stream,
                        sizeof sensor_data[sd->sensor].stream);
-       msleep(20);
        reg_w_buf(gspca_dev, sensor_data[sd->sensor].stream,
                        sizeof sensor_data[sd->sensor].stream);
-       if (sd->sensor != SENSOR_OTHER) {
+       if (sd->sensor == SENSOR_OM6802) {
                msleep(20);
                reg_w(gspca_dev, 0x0309);
        }