V4L/DVB (13489): gspca - sonixj: Add the sensor po1030.

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/sonixj.c b/drivers/media/video/gspca/sonixj.c
index 282c707e5e812cea1bad5deb0af2076a60becb77..0bd36a00dd2a02f9db58c149b9c0418ce2ebf40d 100644 (file)
--- a/drivers/media/video/gspca/sonixj.c
+++ b/drivers/media/video/gspca/sonixj.c
@@ -72,7 +72,8 @@ struct sd {
 #define SENSOR_OV7630 5
 #define SENSOR_OV7648 6
 #define SENSOR_OV7660 7
-#define SENSOR_SP80708 8
+#define SENSOR_PO1030 8
+#define SENSOR_SP80708 9
        u8 i2c_addr;
 
        u8 *jpeg_hdr;
@@ -250,7 +251,7 @@ static struct ctrl sd_ctrls[] = {
                .minimum = 0,
                .maximum = 2,   /* 0: 0, 1: 50Hz, 2:60Hz */
                .step    = 1,
-#define FREQ_DEF 2
+#define FREQ_DEF 1
                .default_value = FREQ_DEF,
            },
            .set = sd_setfreq,
@@ -277,7 +278,9 @@ static __u32 ctrl_dis[] = {
        (1 << AUTOGAIN_IDX) | (1 << INFRARED_IDX) | (1 << VFLIP_IDX),
                                                /* SENSOR_OV7660 7 */
        (1 << AUTOGAIN_IDX) | (1 << INFRARED_IDX) | (1 << VFLIP_IDX) |
-                             (1 << FREQ_IDX),  /* SENSOR_SP80708 8 */
+                             (1 << FREQ_IDX),  /* SENSOR_PO1030 8 */
+       (1 << AUTOGAIN_IDX) | (1 << INFRARED_IDX) | (1 << VFLIP_IDX) |
+                             (1 << FREQ_IDX),  /* SENSOR_SP80708 9 */
 };
 
 static const struct v4l2_pix_format vga_mode[] = {
@@ -388,6 +391,17 @@ static const u8 sn_ov7660[0x1c] = {
        0x07,   0x00,   0x00,   0x00
 };
 
+static const u8 sn_po1030[0x1c] = {
+/*     reg0    reg1    reg2    reg3    reg4    reg5    reg6    reg7 */
+       0x00,   0x21,   0x62,   0x00,   0x1a,   0x20,   0x20,   0x20,
+/*     reg8    reg9    rega    regb    regc    regd    rege    regf */
+       0x81,   0x6e,   0x00,   0x00,   0x00,   0x00,   0x00,   0x00,
+/*     reg10   reg11   reg12   reg13   reg14   reg15   reg16   reg17 */
+       0x03,   0x00,   0x00,   0x06,   0x06,   0x28,   0x1e,   0x00,
+/*     reg18   reg19   reg1a   reg1b */
+       0x07,   0x00,   0x00,   0x00
+};
+
 static const u8 sn_sp80708[0x1c] = {
 /*     reg0    reg1    reg2    reg3    reg4    reg5    reg6    reg7 */
        0x00,   0x63,   0x60,   0x00,   0x1a,   0x20,   0x20,   0x20,
@@ -409,6 +423,7 @@ static const u8 *sn_tb[] = {
        sn_ov7630,
        sn_ov7648,
        sn_ov7660,
+       sn_po1030,
        sn_sp80708
 };
 
@@ -832,6 +847,60 @@ static const u8 ov7660_sensor_param1[][8] = {
        {}
 };
 
+static const u8 po1030_sensor_init[][8] = {
+/* the sensor registers are described in m5602/m5602_po1030.h */
+       {0xa1, 0x6e, 0x3f, 0x20, 0x00, 0x00, 0x00, 0x10}, /* sensor reset */
+       {0xdd, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, /* delay 20ms */
+       {0xa1, 0x6e, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x10},
+       {0xa1, 0x6e, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x10},
+       {0xd1, 0x6e, 0x04, 0x02, 0xb1, 0x02, 0x39, 0x10},
+       {0xd1, 0x6e, 0x08, 0x00, 0x01, 0x00, 0x00, 0x10},
+       {0xd1, 0x6e, 0x0c, 0x02, 0x7f, 0x01, 0xe0, 0x10},
+       {0xd1, 0x6e, 0x12, 0x03, 0x02, 0x00, 0x03, 0x10},
+       {0xd1, 0x6e, 0x16, 0x85, 0x40, 0x4a, 0x40, 0x10}, /* r/g1/b/g2 gains */
+       {0xc1, 0x6e, 0x1a, 0x00, 0x80, 0x00, 0x00, 0x10},
+       {0xd1, 0x6e, 0x1d, 0x08, 0x03, 0x00, 0x00, 0x10},
+       {0xd1, 0x6e, 0x23, 0x00, 0xb0, 0x00, 0x94, 0x10},
+       {0xd1, 0x6e, 0x27, 0x58, 0x00, 0x00, 0x00, 0x10},
+       {0xb1, 0x6e, 0x2b, 0x00, 0x00, 0x00, 0x00, 0x10},
+       {0xd1, 0x6e, 0x2d, 0x14, 0x35, 0x61, 0x84, 0x10}, /* gamma corr */
+       {0xd1, 0x6e, 0x31, 0xa2, 0xbd, 0xd8, 0xff, 0x10},
+       {0xd1, 0x6e, 0x35, 0x06, 0x1e, 0x12, 0x02, 0x10}, /* color matrix */
+       {0xd1, 0x6e, 0x39, 0xaa, 0x53, 0x37, 0xd5, 0x10},
+       {0xa1, 0x6e, 0x3d, 0xf2, 0x00, 0x00, 0x00, 0x10},
+       {0xd1, 0x6e, 0x3e, 0x00, 0x00, 0x80, 0x03, 0x10},
+       {0xd1, 0x6e, 0x42, 0x03, 0x00, 0x00, 0x00, 0x10},
+       {0xc1, 0x6e, 0x46, 0x00, 0x80, 0x80, 0x00, 0x10},
+       {0xd1, 0x6e, 0x4b, 0x02, 0xef, 0x08, 0xcd, 0x10},
+       {0xd1, 0x6e, 0x4f, 0x00, 0xd0, 0x00, 0xa0, 0x10},
+       {0xd1, 0x6e, 0x53, 0x01, 0xaa, 0x01, 0x40, 0x10},
+       {0xd1, 0x6e, 0x5a, 0x50, 0x04, 0x30, 0x03, 0x10}, /* raw rgb bayer */
+       {0xa1, 0x6e, 0x5e, 0x00, 0x00, 0x00, 0x00, 0x10},
+       {0xd1, 0x6e, 0x5f, 0x10, 0x40, 0xff, 0x00, 0x10},
+
+       {0xd1, 0x6e, 0x63, 0x40, 0x40, 0x00, 0x00, 0x10},
+       {0xd1, 0x6e, 0x67, 0x00, 0x00, 0x00, 0x00, 0x10},
+       {0xd1, 0x6e, 0x6b, 0x00, 0x00, 0x00, 0x00, 0x10},
+       {0xd1, 0x6e, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x10},
+       {0xc1, 0x6e, 0x73, 0x10, 0x80, 0xeb, 0x00, 0x10},
+       {}
+};
+static const u8 po1030_sensor_param1[][8] = {
+/* from ms-win traces - these values change with auto gain/expo/wb.. */
+       {0xa1, 0x6e, 0x1e, 0x03, 0x00, 0x00, 0x00, 0x10},
+       {0xa1, 0x6e, 0x1e, 0x03, 0x00, 0x00, 0x00, 0x10},
+/* mean values */
+       {0xc1, 0x6e, 0x1a, 0x02, 0xd4, 0xa4, 0x00, 0x10}, /* integlines */
+       {0xa1, 0x6e, 0x15, 0x04, 0x00, 0x00, 0x00, 0x10}, /* global gain */
+       {0xc1, 0x6e, 0x16, 0x40, 0x40, 0x40, 0x00, 0x10}, /* r/g1/b gains */
+
+       {0xa1, 0x6e, 0x1d, 0x08, 0x00, 0x00, 0x00, 0x10}, /* control1 */
+       {0xa1, 0x6e, 0x06, 0x02, 0x00, 0x00, 0x00, 0x10}, /* frameheight */
+       {0xa1, 0x6e, 0x07, 0xd5, 0x00, 0x00, 0x00, 0x10},
+/*     {0xc1, 0x6e, 0x16, 0x49, 0x40, 0x45, 0x00, 0x10}, */
+       {}
+};
+
 static const u8 sp80708_sensor_init[][8] = {
        {0xa1, 0x18, 0x06, 0xf9, 0x00, 0x00, 0x00, 0x10},
        {0xa1, 0x18, 0x09, 0x1f, 0x00, 0x00, 0x00, 0x10},
@@ -917,7 +986,7 @@ static const u8 sp80708_sensor_param1[][8] = {
        {}
 };
 
-static const u8 (*sensor_init[9])[8] = {
+static const u8 (*sensor_init[10])[8] = {
        hv7131r_sensor_init,    /* HV7131R 0 */
        mi0360_sensor_init,     /* MI0360 1 */
        mo4000_sensor_init,     /* MO4000 2 */
@@ -926,7 +995,8 @@ static const u8 (*sensor_init[9])[8] = {
        ov7630_sensor_init,     /* OV7630 5 */
        ov7648_sensor_init,     /* OV7648 6 */
        ov7660_sensor_init,     /* OV7660 7 */
-       sp80708_sensor_init,    /* SP80708 8 */
+       po1030_sensor_init,     /* PO1030 8 */
+       sp80708_sensor_init,    /* SP80708 9 */
 };
 
 /* read <len> bytes to gspca_dev->usb_buf */
@@ -1033,8 +1103,8 @@ static void i2c_w8(struct gspca_dev *gspca_dev,
        msleep(2);
 }
 
-/* read 5 bytes in gspca_dev->usb_buf */
-static void i2c_r5(struct gspca_dev *gspca_dev, u8 reg)
+/* sensor read 'len' (1..5) bytes in gspca_dev->usb_buf */
+static void i2c_r(struct gspca_dev *gspca_dev, u8 reg, int len)
 {
        struct sd *sd = (struct sd *) gspca_dev;
        u8 mode[8];
@@ -1056,7 +1126,7 @@ static void i2c_r5(struct gspca_dev *gspca_dev, u8 reg)
        mode[7] = 0x10;
        i2c_w8(gspca_dev, mode);
        msleep(2);
-       mode[0] = (mode[0] & 0x81) | (5 << 4) | 0x02;
+       mode[0] = (mode[0] & 0x81) | (len << 4) | 0x02;
        mode[2] = 0;
        i2c_w8(gspca_dev, mode);
        msleep(2);
@@ -1081,7 +1151,7 @@ static void hv7131r_probe(struct gspca_dev *gspca_dev)
        msleep(10);
        reg_w1(gspca_dev, 0x02, 0x66);                  /* Gpio on */
        msleep(10);
-       i2c_r5(gspca_dev, 0);                           /* read sensor id */
+       i2c_r(gspca_dev, 0, 5);                         /* read sensor id */
        if (gspca_dev->usb_buf[0] == 0x02
            && gspca_dev->usb_buf[1] == 0x09
            && gspca_dev->usb_buf[2] == 0x01
@@ -1144,6 +1214,41 @@ static void mi0360_probe(struct gspca_dev *gspca_dev)
        }
 }
 
+static void ov7648_probe(struct gspca_dev *gspca_dev)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+
+       /* check ov76xx */
+       reg_w1(gspca_dev, 0x17, 0x62);
+       reg_w1(gspca_dev, 0x01, 0x08);
+       sd->i2c_addr = 0x21;
+       i2c_r(gspca_dev, 0x0a, 2);
+       if (gspca_dev->usb_buf[3] == 0x76) {    /* ov76xx */
+               PDEBUG(D_PROBE, "Sensor ov%02x%02x",
+                       gspca_dev->usb_buf[3], gspca_dev->usb_buf[4]);
+               return;
+       }
+
+       /* reset */
+       reg_w1(gspca_dev, 0x01, 0x29);
+       reg_w1(gspca_dev, 0x17, 0x42);
+
+       /* check po1030 */
+       reg_w1(gspca_dev, 0x17, 0x62);
+       reg_w1(gspca_dev, 0x01, 0x08);
+       sd->i2c_addr = 0x6e;
+       i2c_r(gspca_dev, 0x00, 2);
+       if (gspca_dev->usb_buf[3] == 0x10       /* po1030 */
+           && gspca_dev->usb_buf[4] == 0x30) {
+               PDEBUG(D_PROBE, "Sensor po1030");
+               sd->sensor = SENSOR_PO1030;
+               return;
+       }
+
+       PDEBUG(D_PROBE, "Unknown sensor %02x%02x",
+               gspca_dev->usb_buf[3], gspca_dev->usb_buf[4]);
+}
+
 static void bridge_init(struct gspca_dev *gspca_dev,
                          const u8 *sn9c1xx)
 {
@@ -1164,6 +1269,7 @@ static void bridge_init(struct gspca_dev *gspca_dev,
        reg_w(gspca_dev, 0x17, &sn9c1xx[0x17], 5);
        switch (sd->sensor) {
        case SENSOR_OV7660:
+       case SENSOR_PO1030:
        case SENSOR_SP80708:
                reg9a = reg9a_spec;
                break;
@@ -1214,7 +1320,14 @@ static void bridge_init(struct gspca_dev *gspca_dev,
                reg_w1(gspca_dev, 0x01, 0x62);
                reg_w1(gspca_dev, 0x01, 0x42);
                break;
+       case SENSOR_PO1030:
+               reg_w1(gspca_dev, 0x01, 0x61);
+               reg_w1(gspca_dev, 0x17, 0x20);
+               reg_w1(gspca_dev, 0x01, 0x60);
+               reg_w1(gspca_dev, 0x01, 0x40);
+               break;
        case SENSOR_OV7660:
+               /* fall thru */
        case SENSOR_SP80708:
                reg_w1(gspca_dev, 0x01, 0x63);
                reg_w1(gspca_dev, 0x17, 0x20);
@@ -1266,7 +1379,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
        sd->quality = QUALITY_DEF;
        sd->jpegqual = 80;
 
-       gspca_dev->ctrl_dis = ctrl_dis[sd->sensor];
        return 0;
 }
 
@@ -1301,8 +1413,14 @@ static int sd_init(struct gspca_dev *gspca_dev)
        case BRIDGE_SN9C120:
                if (regF1 != 0x12)
                        return -ENODEV;
-               if (sd->sensor == SENSOR_MI0360)
+               switch (sd->sensor) {
+               case SENSOR_MI0360:
                        mi0360_probe(gspca_dev);
+                       break;
+               case SENSOR_OV7648:
+                       ov7648_probe(gspca_dev);
+                       break;
+               }
                regGpio[1] = 0x70;
                reg_w(gspca_dev, 0x01, regGpio, 2);
                break;
@@ -1321,6 +1439,8 @@ static int sd_init(struct gspca_dev *gspca_dev)
        sn9c1xx = sn_tb[sd->sensor];
        sd->i2c_addr = sn9c1xx[9];
 
+       gspca_dev->ctrl_dis = ctrl_dis[sd->sensor];
+
        return 0;
 }
 
@@ -1742,6 +1862,9 @@ static int sd_start(struct gspca_dev *gspca_dev)
        case SENSOR_OV7660:
                reg17 = 0xa0;
                break;
+       case SENSOR_PO1030:
+               reg17 = 0xa0;
+               break;
        default:
                reg17 = 0x60;
                break;
@@ -1839,6 +1962,11 @@ static int sd_start(struct gspca_dev *gspca_dev)
                                         * inverse power down */
                }
                break;
+       case SENSOR_PO1030:
+               init = po1030_sensor_param1;
+               reg17 = 0xa2;
+               reg1 = 0x44;
+               break;
        default:
 /*     case SENSOR_SP80708: */
                init = sp80708_sensor_param1;
@@ -1919,6 +2047,7 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
                /* fall thru */
        case SENSOR_MT9V111:
        case SENSOR_OV7630:
+       case SENSOR_PO1030:
                data = 0x29;
                break;
        }
@@ -2325,7 +2454,7 @@ static const __devinitdata struct usb_device_id device_table[] = {
 /*     {USB_DEVICE(0x0c45, 0x6123), BS(SN9C110, SanyoCCD)}, */
        {USB_DEVICE(0x0c45, 0x6128), BS(SN9C120, OM6802)},      /*sn9c325?*/
 /*bw600.inf:*/
-       {USB_DEVICE(0x0c45, 0x612a), BS(SN9C120, OV7648)},      /*sn9c110?*/
+       {USB_DEVICE(0x0c45, 0x612a), BS(SN9C120, OV7648)},      /*sn9c325?*/
        {USB_DEVICE(0x0c45, 0x612c), BS(SN9C110, MO4000)},
        {USB_DEVICE(0x0c45, 0x612e), BS(SN9C110, OV7630)},
 /*     {USB_DEVICE(0x0c45, 0x612f), BS(SN9C110, ICM105C)}, */