2 files changed, 312 insertions, 8 deletions
diff --git a/Documentation/video4linux/gspca.txt b/Documentation/video4linux/gspca.txt
index a38c87246dad..81d7d891c15f 100644
--- a/Documentation/video4linux/gspca.txt
+++ b/Documentation/video4linux/gspca.txt
@@ -271,6 +271,7 @@ spca561		10fd:7e50	FlyCam Usb 100
 zc3xx           10fd:8050       Typhoon Webshot II USB 300k
 ov534           1415:2000       Sony HD Eye for PS3 (SLEH 00201)
 pac207          145f:013a       Trust WB-1300N
+vc032x          15b8:6002       HP 2.0 Megapixel rz406aa
 spca501         1776:501c       Arowana 300K CMOS Camera
 t613            17a1:0128       TASCORP JPEG Webcam, NGS Cyclops
 vc032x          17ef:4802       Lenovo Vc0323+MI1310_SOC
diff --git a/drivers/media/video/gspca/vc032x.c b/drivers/media/video/gspca/vc032x.c
index 9ac66c9b558b..b1ab37e12220 100644
--- a/drivers/media/video/gspca/vc032x.c
+++ b/drivers/media/video/gspca/vc032x.c
@@ -47,7 +47,8 @@ struct sd {
 #define SENSOR_MI1310_SOC 3
 #define SENSOR_OV7660 4
 #define SENSOR_OV7670 5
-#define SENSOR_PO3130NC 6
+#define SENSOR_PO1200 6
+#define SENSOR_PO3130NC 7
 };
 /* V4L2 controls supported by the driver */
@@ -132,6 +133,14 @@ static struct v4l2_pix_format vc0323_mode[] = {
                .priv = 0},
 };
+static struct v4l2_pix_format svga_mode[] = {
+        {800, 600, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
+                .bytesperline = 800,
+                .sizeimage = 800 * 600 * 1 / 4 + 590,
+                .colorspace = V4L2_COLORSPACE_JPEG,
+                .priv = 0},
+};
 /* OV7660/7670 registers */
 #define OV7660_REG_MVFP 0x1e
 #define OV7660_MVFP_MIRROR      0x20
@@ -1466,6 +1475,281 @@ static const __u8 ov7670_initQVGA_JPG[][4] = {
        {0x00, 0x77, 0x05, 0xaa },
        {},
 };
+/* PO1200 - values from usbvm326.inf and ms-win trace */
+static const __u8 po1200_gamma[17] = {
+        0x00, 0x13, 0x38, 0x59, 0x79, 0x92, 0xa7, 0xb9, 0xc8,
+        0xd4, 0xdf, 0xe7, 0xee, 0xf4, 0xf9, 0xfc, 0xff
+};
+static const __u8 po1200_matrix[9] = {
+        0x60, 0xf9, 0xe5, 0xe7, 0x50, 0x05, 0xf3, 0xe6, 0x5e
+};
+static const __u8 po1200_initVGA_data[][4] = {
+        {0xb0, 0x03, 0x19, 0xcc},       /* reset? */
+        {0xb0, 0x03, 0x19, 0xcc},
+/*      {0x00, 0x00, 0x33, 0xdd}, */
+        {0xb0, 0x04, 0x02, 0xcc},
+        {0xb0, 0x02, 0x02, 0xcc},
+        {0xb3, 0x5d, 0x00, 0xcc},
+        {0xb3, 0x01, 0x01, 0xcc},
+        {0xb3, 0x00, 0x64, 0xcc},
+        {0xb3, 0x00, 0x65, 0xcc},
+        {0xb3, 0x05, 0x01, 0xcc},
+        {0xb3, 0x06, 0x01, 0xcc},
+        {0xb3, 0x5c, 0x01, 0xcc},
+        {0xb3, 0x08, 0x01, 0xcc},
+        {0xb3, 0x09, 0x0c, 0xcc},
+        {0xb3, 0x00, 0x67, 0xcc},
+        {0xb3, 0x02, 0xb2, 0xcc},
+        {0xb3, 0x03, 0x18, 0xcc},
+        {0xb3, 0x04, 0x15, 0xcc},
+        {0xb3, 0x20, 0x00, 0xcc},
+        {0xb3, 0x21, 0x00, 0xcc},
+        {0xb3, 0x22, 0x02, 0xcc},
+        {0xb3, 0x23, 0x58, 0xcc},
+        {0xb3, 0x14, 0x00, 0xcc},
+        {0xb3, 0x15, 0x00, 0xcc},
+        {0xb3, 0x16, 0x03, 0xcc},
+        {0xb3, 0x17, 0x1f, 0xcc},
+        {0xbc, 0x00, 0x71, 0xcc},
+        {0xbc, 0x01, 0x01, 0xcc},
+        {0xb0, 0x54, 0x13, 0xcc},
+        {0xb3, 0x00, 0x67, 0xcc},
+        {0xb3, 0x34, 0x01, 0xcc},
+        {0xb3, 0x35, 0xdc, 0xcc},
+        {0x00, 0x03, 0x00, 0xaa},
+        {0x00, 0x12, 0x05, 0xaa},
+        {0x00, 0x13, 0x02, 0xaa},
+        {0x00, 0x1e, 0xc6, 0xaa},
+        {0x00, 0x21, 0x00, 0xaa},
+        {0x00, 0x25, 0x02, 0xaa},
+        {0x00, 0x3c, 0x4f, 0xaa},
+        {0x00, 0x3f, 0xe0, 0xaa},
+        {0x00, 0x42, 0xff, 0xaa},
+        {0x00, 0x45, 0x34, 0xaa},
+        {0x00, 0x55, 0xfe, 0xaa},
+        {0x00, 0x59, 0xd3, 0xaa},
+        {0x00, 0x5e, 0x04, 0xaa},
+        {0x00, 0x61, 0xb8, 0xaa},
+        {0x00, 0x62, 0x02, 0xaa},
+        {0x00, 0xa7, 0x31, 0xaa},
+        {0x00, 0xa9, 0x66, 0xaa},
+        {0x00, 0xb0, 0x00, 0xaa},
+        {0x00, 0xb1, 0x00, 0xaa},
+        {0x00, 0xb3, 0x11, 0xaa},
+        {0x00, 0xb6, 0x26, 0xaa},
+        {0x00, 0xb7, 0x20, 0xaa},
+        {0x00, 0xba, 0x04, 0xaa},
+        {0x00, 0x88, 0x42, 0xaa},
+        {0x00, 0x89, 0x9a, 0xaa},
+        {0x00, 0x8a, 0x88, 0xaa},
+        {0x00, 0x8b, 0x8e, 0xaa},
+        {0x00, 0x8c, 0x3e, 0xaa},
+        {0x00, 0x8d, 0x90, 0xaa},
+        {0x00, 0x8e, 0x87, 0xaa},
+        {0x00, 0x8f, 0x96, 0xaa},
+        {0x00, 0x90, 0x3d, 0xaa},
+        {0x00, 0x64, 0x00, 0xaa},
+        {0x00, 0x65, 0x10, 0xaa},
+        {0x00, 0x66, 0x20, 0xaa},
+        {0x00, 0x67, 0x2b, 0xaa},
+        {0x00, 0x68, 0x36, 0xaa},
+        {0x00, 0x69, 0x49, 0xaa},
+        {0x00, 0x6a, 0x5a, 0xaa},
+        {0x00, 0x6b, 0x7f, 0xaa},
+        {0x00, 0x6c, 0x9b, 0xaa},
+        {0x00, 0x6d, 0xba, 0xaa},
+        {0x00, 0x6e, 0xd4, 0xaa},
+        {0x00, 0x6f, 0xea, 0xaa},
+        {0x00, 0x70, 0x00, 0xaa},
+        {0x00, 0x71, 0x10, 0xaa},
+        {0x00, 0x72, 0x20, 0xaa},
+        {0x00, 0x73, 0x2b, 0xaa},
+        {0x00, 0x74, 0x36, 0xaa},
+        {0x00, 0x75, 0x49, 0xaa},
+        {0x00, 0x76, 0x5a, 0xaa},
+        {0x00, 0x77, 0x7f, 0xaa},
+        {0x00, 0x78, 0x9b, 0xaa},
+        {0x00, 0x79, 0xba, 0xaa},
+        {0x00, 0x7a, 0xd4, 0xaa},
+        {0x00, 0x7b, 0xea, 0xaa},
+        {0x00, 0x7c, 0x00, 0xaa},
+        {0x00, 0x7d, 0x10, 0xaa},
+        {0x00, 0x7e, 0x20, 0xaa},
+        {0x00, 0x7f, 0x2b, 0xaa},
+        {0x00, 0x80, 0x36, 0xaa},
+        {0x00, 0x81, 0x49, 0xaa},
+        {0x00, 0x82, 0x5a, 0xaa},
+        {0x00, 0x83, 0x7f, 0xaa},
+        {0x00, 0x84, 0x9b, 0xaa},
+        {0x00, 0x85, 0xba, 0xaa},
+        {0x00, 0x86, 0xd4, 0xaa},
+        {0x00, 0x87, 0xea, 0xaa},
+        {0x00, 0x57, 0x2a, 0xaa},
+        {0x00, 0x03, 0x01, 0xaa},
+        {0x00, 0x04, 0x10, 0xaa},
+        {0x00, 0x05, 0x10, 0xaa},
+        {0x00, 0x06, 0x10, 0xaa},
+        {0x00, 0x07, 0x10, 0xaa},
+        {0x00, 0x08, 0x13, 0xaa},
+        {0x00, 0x0a, 0x00, 0xaa},
+        {0x00, 0x0b, 0x10, 0xaa},
+        {0x00, 0x0c, 0x20, 0xaa},
+        {0x00, 0x0d, 0x18, 0xaa},
+        {0x00, 0x22, 0x01, 0xaa},
+        {0x00, 0x23, 0x60, 0xaa},
+        {0x00, 0x25, 0x08, 0xaa},
+        {0x00, 0x26, 0x82, 0xaa},
+        {0x00, 0x2e, 0x0f, 0xaa},
+        {0x00, 0x2f, 0x1e, 0xaa},
+        {0x00, 0x30, 0x2d, 0xaa},
+        {0x00, 0x31, 0x3c, 0xaa},
+        {0x00, 0x32, 0x4b, 0xaa},
+        {0x00, 0x33, 0x5a, 0xaa},
+        {0x00, 0x34, 0x69, 0xaa},
+        {0x00, 0x35, 0x78, 0xaa},
+        {0x00, 0x36, 0x87, 0xaa},
+        {0x00, 0x37, 0x96, 0xaa},
+        {0x00, 0x38, 0xa5, 0xaa},
+        {0x00, 0x39, 0xb4, 0xaa},
+        {0x00, 0x3a, 0xc3, 0xaa},
+        {0x00, 0x3b, 0xd2, 0xaa},
+        {0x00, 0x3c, 0xe1, 0xaa},
+        {0x00, 0x3e, 0xff, 0xaa},
+        {0x00, 0x3f, 0xff, 0xaa},
+        {0x00, 0x40, 0xff, 0xaa},
+        {0x00, 0x41, 0xff, 0xaa},
+        {0x00, 0x42, 0xff, 0xaa},
+        {0x00, 0x43, 0xff, 0xaa},
+        {0x00, 0x03, 0x00, 0xaa},
+        {0x00, 0x03, 0x00, 0xaa},
+        {0x00, 0x20, 0xc4, 0xaa},
+        {0x00, 0x13, 0x03, 0xaa},
+        {0x00, 0x3c, 0x50, 0xaa},
+        {0x00, 0x61, 0x6a, 0xaa},
+        {0x00, 0x51, 0x5b, 0xaa},
+        {0x00, 0x52, 0x91, 0xaa},
+        {0x00, 0x53, 0x4c, 0xaa},
+        {0x00, 0x54, 0x50, 0xaa},
+        {0x00, 0x56, 0x02, 0xaa},
+        {0xb6, 0x00, 0x00, 0xcc},
+        {0xb6, 0x03, 0x03, 0xcc},
+        {0xb6, 0x02, 0x20, 0xcc},
+        {0xb6, 0x05, 0x02, 0xcc},
+        {0xb6, 0x04, 0x58, 0xcc},
+        {0xb6, 0x12, 0xf8, 0xcc},
+        {0xb6, 0x13, 0x21, 0xcc},
+        {0xb6, 0x18, 0x03, 0xcc},
+        {0xb6, 0x17, 0xa9, 0xcc},
+        {0xb6, 0x16, 0x80, 0xcc},
+        {0xb6, 0x22, 0x12, 0xcc},
+        {0xb6, 0x23, 0x0b, 0xcc},
+        {0xbf, 0xc0, 0x39, 0xcc},
+        {0xbf, 0xc1, 0x04, 0xcc},
+        {0xbf, 0xcc, 0x00, 0xcc},
+        {0xb8, 0x06, 0x20, 0xcc},
+        {0xb8, 0x07, 0x03, 0xcc},
+        {0xb8, 0x08, 0x58, 0xcc},
+        {0xb8, 0x09, 0x02, 0xcc},
+        {0xb3, 0x01, 0x41, 0xcc},
+        {0x00, 0x03, 0x00, 0xaa},
+        {0x00, 0xd9, 0x0f, 0xaa},
+        {0x00, 0xda, 0xaa, 0xaa},
+        {0x00, 0xd9, 0x10, 0xaa},
+        {0x00, 0xda, 0xaa, 0xaa},
+        {0x00, 0xd9, 0x11, 0xaa},
+        {0x00, 0xda, 0x00, 0xaa},
+        {0x00, 0xd9, 0x12, 0xaa},
+        {0x00, 0xda, 0xff, 0xaa},
+        {0x00, 0xd9, 0x13, 0xaa},
+        {0x00, 0xda, 0xff, 0xaa},
+        {0x00, 0xe8, 0x11, 0xaa},
+        {0x00, 0xe9, 0x12, 0xaa},
+        {0x00, 0xea, 0x5c, 0xaa},
+        {0x00, 0xeb, 0xff, 0xaa},
+        {0x00, 0xd8, 0x80, 0xaa},
+        {0x00, 0xe6, 0x02, 0xaa},
+        {0x00, 0xd6, 0x40, 0xaa},
+        {0x00, 0xe3, 0x05, 0xaa},
+        {0x00, 0xe0, 0x40, 0xaa},
+        {0x00, 0xde, 0x03, 0xaa},
+        {0x00, 0xdf, 0x03, 0xaa},
+        {0x00, 0xdb, 0x02, 0xaa},
+        {0x00, 0xdc, 0x00, 0xaa},
+        {0x00, 0xdd, 0x03, 0xaa},
+        {0x00, 0xe1, 0x08, 0xaa},
+        {0x00, 0xe2, 0x01, 0xaa},
+        {0x00, 0xd6, 0x40, 0xaa},
+        {0x00, 0xe4, 0x40, 0xaa},
+        {0x00, 0xa8, 0x9f, 0xaa},
+        {0x00, 0xb4, 0x16, 0xaa},
+        {0xb0, 0x02, 0x06, 0xcc},
+        {0xb0, 0x18, 0x06, 0xcc},
+        {0xb0, 0x19, 0x06, 0xcc},
+        {0xb3, 0x5d, 0x18, 0xcc},
+        {0xb3, 0x05, 0x00, 0xcc},
+        {0xb3, 0x06, 0x00, 0xcc},
+        {0x00, 0xb4, 0x0e, 0xaa},
+        {0x00, 0xb5, 0x49, 0xaa},
+        {0x00, 0xb6, 0x1c, 0xaa},
+        {0x00, 0xb7, 0x96, 0xaa},
+/* end of usbvm326.inf - start of ms-win trace */
+        {0xb6, 0x12, 0xf8, 0xcc},
+        {0xb6, 0x13, 0x3d, 0xcc},
+/*read b306*/
+        {0x00, 0x03, 0x00, 0xaa},
+        {0x00, 0x1a, 0x09, 0xaa},
+        {0x00, 0x1b, 0x8a, 0xaa},
+/*read b827*/
+        {0xb8, 0x27, 0x00, 0xcc},
+        {0xb8, 0x26, 0x60, 0xcc},
+        {0xb8, 0x26, 0x60, 0xcc},
+/*gamma - to do?*/
+        {0x00, 0x03, 0x00, 0xaa},
+        {0x00, 0xae, 0x84, 0xaa},
+/*gamma again*/
+        {0x00, 0x03, 0x00, 0xaa},
+        {0x00, 0x96, 0xa0, 0xaa},
+/*matrix*/
+        {0x00, 0x03, 0x00, 0xaa},
+        {0x00, 0x91, 0x35, 0xaa},
+        {0x00, 0x92, 0x22, 0xaa},
+/*gamma*/
+        {0x00, 0x03, 0x00, 0xaa},
+        {0x00, 0x95, 0x85, 0xaa},
+/*matrix*/
+        {0x00, 0x03, 0x00, 0xaa},
+        {0x00, 0x61, 0xb8, 0xaa},
+        {0x00, 0x03, 0x00, 0xaa},
+        {0x00, 0x4d, 0x20, 0xaa},
+        {0xb8, 0x22, 0x40, 0xcc},
+        {0xb8, 0x23, 0x40, 0xcc},
+        {0xb8, 0x24, 0x40, 0xcc},
+        {0xb8, 0x81, 0x09, 0xcc},
+        {0x00, 0x00, 0x64, 0xdd},
+        {0x00, 0x03, 0x01, 0xaa},
+/*read 46*/
+        {0x00, 0x46, 0x3c, 0xaa},
+        {0x00, 0x03, 0x00, 0xaa},
+        {0x00, 0x16, 0x40, 0xaa},
+        {0x00, 0x17, 0x40, 0xaa},
+        {0x00, 0x18, 0x40, 0xaa},
+        {0x00, 0x19, 0x41, 0xaa},
+        {0x00, 0x03, 0x01, 0xaa},
+        {0x00, 0x46, 0x3c, 0xaa},
+        {0x00, 0x00, 0x18, 0xdd},
+/*read bfff*/
+        {0x00, 0x03, 0x00, 0xaa},
+        {0x00, 0x1e, 0x46, 0xaa},
+        {0x00, 0xa8, 0x8f, 0xaa},
+        {0x00, 0x03, 0x00, 0xaa},
+        {0x00, 0xb4, 0x1c, 0xaa},
+        {0x00, 0xb5, 0x92, 0xaa},
+        {0x00, 0xb6, 0x39, 0xaa},
+        {0x00, 0xb7, 0x24, 0xaa},
+/*write 89 0400 1415*/
+};
 struct sensor_info {
        int sensorId;
        __u8 I2cAdd;
@@ -1486,6 +1770,7 @@ static const struct sensor_info sensor_info_data[] = {
        {SENSOR_MI1310_SOC, 0x80 | 0x5d, 0x00, 0x143a, 0x24, 0x25, 0x01},
 /* (tested in vc032x_probe_sensor) */
 /*      {SENSOR_MI0360,     0x80 | 0x5d, 0x00, 0x8243, 0x24, 0x25, 0x01}, */
+        {SENSOR_PO1200,     0x80 | 0x5c, 0x00, 0x1200, 0x67, 0x67, 0x01},
 };
 /* read 'len' bytes in gspca_dev->usb_buf */
@@ -1709,6 +1994,9 @@ static int sd_config(struct gspca_dev *gspca_dev,
        case SENSOR_OV7670:
                PDEBUG(D_PROBE, "Find Sensor OV7670");
                break;
+        case SENSOR_PO1200:
+                PDEBUG(D_PROBE, "Find Sensor PO1200");
+                break;
        case SENSOR_PO3130NC:
                PDEBUG(D_PROBE, "Find Sensor PO3130NC");
                break;
@@ -1719,8 +2007,13 @@ static int sd_config(struct gspca_dev *gspca_dev,
                cam->cam_mode = vc0321_mode;
                cam->nmodes = ARRAY_SIZE(vc0321_mode);
        } else {
-                cam->cam_mode = vc0323_mode;
+                if (sensor != SENSOR_PO1200) {
-                cam->nmodes = ARRAY_SIZE(vc0323_mode);
+                        cam->cam_mode = vc0323_mode;
+                        cam->nmodes = ARRAY_SIZE(vc0323_mode);
+                } else {
+                        cam->cam_mode = svga_mode;
+                        cam->nmodes = ARRAY_SIZE(svga_mode);
+                }
        }
        sd->qindex = 7;
@@ -1888,6 +2181,11 @@ static int sd_start(struct gspca_dev *gspca_dev)
                }
                usb_exchange(gspca_dev, po3130_rundata);
                break;
+        case SENSOR_PO1200:
+                GammaT = po1200_gamma;
+                MatrixT = po1200_matrix;
+                usb_exchange(gspca_dev, po1200_initVGA_data);
+                break;
        default:
                PDEBUG(D_PROBE, "Damned !! no sensor found Bye");
                return -EMEDIUMTYPE;
@@ -1920,11 +2218,15 @@ static int sd_start(struct gspca_dev *gspca_dev)
                reg_w(gspca_dev->dev, 0xa0, 0x23, 0xb800); * ISP CTRL_BAS
                */
                /* set the led on 0x0892 0x0896 */
-                reg_w(gspca_dev->dev, 0x89, 0xffff, 0xfdff);
+                if (sd->sensor != SENSOR_PO1200) {
-                msleep(100);
+                        reg_w(gspca_dev->dev, 0x89, 0xffff, 0xfdff);
-                setquality(gspca_dev);
+                        msleep(100);
-                sethvflip(gspca_dev);
+                        setquality(gspca_dev);
-                setlightfreq(gspca_dev);
+                        sethvflip(gspca_dev);
+                        setlightfreq(gspca_dev);
+                } else {
+                        reg_w(gspca_dev->dev, 0x89, 0x0400, 0x1415);
+                }
        }
        return 0;
 }
@@ -2071,6 +2373,7 @@ static const __devinitdata struct usb_device_id device_table[] = {
        {USB_DEVICE(0x0ac8, 0x0328), .driver_info = BRIDGE_VC0321},
        {USB_DEVICE(0x0ac8, 0xc001), .driver_info = BRIDGE_VC0321},
        {USB_DEVICE(0x0ac8, 0xc002), .driver_info = BRIDGE_VC0321},
+        {USB_DEVICE(0x15b8, 0x6002), .driver_info = BRIDGE_VC0323},
        {USB_DEVICE(0x17ef, 0x4802), .driver_info = BRIDGE_VC0323},
        {}
 };

diff --git a/Documentation/video4linux/gspca.txt b/Documentation/video4linux/gspca.txt index a38c87246dad..81d7d891c15f 100644 --- a/Documentation/video4linux/gspca.txt +++ b/Documentation/video4linux/gspca.txt
@@ -271,6 +271,7 @@ spca561 10fd:7e50 FlyCam Usb 100
271	zc3xx 10fd:8050 Typhoon Webshot II USB 300k	271	zc3xx 10fd:8050 Typhoon Webshot II USB 300k
272	ov534 1415:2000 Sony HD Eye for PS3 (SLEH 00201)	272	ov534 1415:2000 Sony HD Eye for PS3 (SLEH 00201)
273	pac207 145f:013a Trust WB-1300N	273	pac207 145f:013a Trust WB-1300N
		274	vc032x 15b8:6002 HP 2.0 Megapixel rz406aa
274	spca501 1776:501c Arowana 300K CMOS Camera	275	spca501 1776:501c Arowana 300K CMOS Camera
275	t613 17a1:0128 TASCORP JPEG Webcam, NGS Cyclops	276	t613 17a1:0128 TASCORP JPEG Webcam, NGS Cyclops
276	vc032x 17ef:4802 Lenovo Vc0323+MI1310_SOC	277	vc032x 17ef:4802 Lenovo Vc0323+MI1310_SOC


diff --git a/drivers/media/video/gspca/vc032x.c b/drivers/media/video/gspca/vc032x.c index 9ac66c9b558b..b1ab37e12220 100644 --- a/drivers/media/video/gspca/vc032x.c +++ b/drivers/media/video/gspca/vc032x.c
@@ -47,7 +47,8 @@ struct sd {
47	#define SENSOR_MI1310_SOC 3	47	#define SENSOR_MI1310_SOC 3
48	#define SENSOR_OV7660 4	48	#define SENSOR_OV7660 4
49	#define SENSOR_OV7670 5	49	#define SENSOR_OV7670 5
50	#define SENSOR_PO3130NC 6	50	#define SENSOR_PO1200 6
		51	#define SENSOR_PO3130NC 7
51	};	52	};
52		53
53	/* V4L2 controls supported by the driver */	54	/* V4L2 controls supported by the driver */
@@ -132,6 +133,14 @@ static struct v4l2_pix_format vc0323_mode[] = {
132	.priv = 0},	133	.priv = 0},
133	};	134	};
134		135
		136	static struct v4l2_pix_format svga_mode[] = {
		137	{800, 600, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
		138	.bytesperline = 800,
		139	.sizeimage = 800 * 600 * 1 / 4 + 590,
		140	.colorspace = V4L2_COLORSPACE_JPEG,
		141	.priv = 0},
		142	};
		143
135	/* OV7660/7670 registers */	144	/* OV7660/7670 registers */
136	#define OV7660_REG_MVFP 0x1e	145	#define OV7660_REG_MVFP 0x1e
137	#define OV7660_MVFP_MIRROR 0x20	146	#define OV7660_MVFP_MIRROR 0x20
@@ -1466,6 +1475,281 @@ static const __u8 ov7670_initQVGA_JPG[][4] = {
1466	{0x00, 0x77, 0x05, 0xaa },	1475	{0x00, 0x77, 0x05, 0xaa },
1467	{},	1476	{},
1468	};	1477	};
		1478
		1479	/* PO1200 - values from usbvm326.inf and ms-win trace */
		1480	static const __u8 po1200_gamma[17] = {
		1481	0x00, 0x13, 0x38, 0x59, 0x79, 0x92, 0xa7, 0xb9, 0xc8,
		1482	0xd4, 0xdf, 0xe7, 0xee, 0xf4, 0xf9, 0xfc, 0xff
		1483	};
		1484	static const __u8 po1200_matrix[9] = {
		1485	0x60, 0xf9, 0xe5, 0xe7, 0x50, 0x05, 0xf3, 0xe6, 0x5e
		1486	};
		1487	static const __u8 po1200_initVGA_data[][4] = {
		1488	{0xb0, 0x03, 0x19, 0xcc}, /* reset? */
		1489	{0xb0, 0x03, 0x19, 0xcc},
		1490	/* {0x00, 0x00, 0x33, 0xdd}, */
		1491	{0xb0, 0x04, 0x02, 0xcc},
		1492	{0xb0, 0x02, 0x02, 0xcc},
		1493	{0xb3, 0x5d, 0x00, 0xcc},
		1494	{0xb3, 0x01, 0x01, 0xcc},
		1495	{0xb3, 0x00, 0x64, 0xcc},
		1496	{0xb3, 0x00, 0x65, 0xcc},
		1497	{0xb3, 0x05, 0x01, 0xcc},
		1498	{0xb3, 0x06, 0x01, 0xcc},
		1499	{0xb3, 0x5c, 0x01, 0xcc},
		1500	{0xb3, 0x08, 0x01, 0xcc},
		1501	{0xb3, 0x09, 0x0c, 0xcc},
		1502	{0xb3, 0x00, 0x67, 0xcc},
		1503	{0xb3, 0x02, 0xb2, 0xcc},
		1504	{0xb3, 0x03, 0x18, 0xcc},
		1505	{0xb3, 0x04, 0x15, 0xcc},
		1506	{0xb3, 0x20, 0x00, 0xcc},
		1507	{0xb3, 0x21, 0x00, 0xcc},
		1508	{0xb3, 0x22, 0x02, 0xcc},
		1509	{0xb3, 0x23, 0x58, 0xcc},
		1510	{0xb3, 0x14, 0x00, 0xcc},
		1511	{0xb3, 0x15, 0x00, 0xcc},
		1512	{0xb3, 0x16, 0x03, 0xcc},
		1513	{0xb3, 0x17, 0x1f, 0xcc},
		1514	{0xbc, 0x00, 0x71, 0xcc},
		1515	{0xbc, 0x01, 0x01, 0xcc},
		1516	{0xb0, 0x54, 0x13, 0xcc},
		1517	{0xb3, 0x00, 0x67, 0xcc},
		1518	{0xb3, 0x34, 0x01, 0xcc},
		1519	{0xb3, 0x35, 0xdc, 0xcc},
		1520	{0x00, 0x03, 0x00, 0xaa},
		1521	{0x00, 0x12, 0x05, 0xaa},
		1522	{0x00, 0x13, 0x02, 0xaa},
		1523	{0x00, 0x1e, 0xc6, 0xaa},
		1524	{0x00, 0x21, 0x00, 0xaa},
		1525	{0x00, 0x25, 0x02, 0xaa},
		1526	{0x00, 0x3c, 0x4f, 0xaa},
		1527	{0x00, 0x3f, 0xe0, 0xaa},
		1528	{0x00, 0x42, 0xff, 0xaa},
		1529	{0x00, 0x45, 0x34, 0xaa},
		1530	{0x00, 0x55, 0xfe, 0xaa},
		1531	{0x00, 0x59, 0xd3, 0xaa},
		1532	{0x00, 0x5e, 0x04, 0xaa},
		1533	{0x00, 0x61, 0xb8, 0xaa},
		1534	{0x00, 0x62, 0x02, 0xaa},
		1535	{0x00, 0xa7, 0x31, 0xaa},
		1536	{0x00, 0xa9, 0x66, 0xaa},
		1537	{0x00, 0xb0, 0x00, 0xaa},
		1538	{0x00, 0xb1, 0x00, 0xaa},
		1539	{0x00, 0xb3, 0x11, 0xaa},
		1540	{0x00, 0xb6, 0x26, 0xaa},
		1541	{0x00, 0xb7, 0x20, 0xaa},
		1542	{0x00, 0xba, 0x04, 0xaa},
		1543	{0x00, 0x88, 0x42, 0xaa},
		1544	{0x00, 0x89, 0x9a, 0xaa},
		1545	{0x00, 0x8a, 0x88, 0xaa},
		1546	{0x00, 0x8b, 0x8e, 0xaa},
		1547	{0x00, 0x8c, 0x3e, 0xaa},
		1548	{0x00, 0x8d, 0x90, 0xaa},
		1549	{0x00, 0x8e, 0x87, 0xaa},
		1550	{0x00, 0x8f, 0x96, 0xaa},
		1551	{0x00, 0x90, 0x3d, 0xaa},
		1552	{0x00, 0x64, 0x00, 0xaa},
		1553	{0x00, 0x65, 0x10, 0xaa},
		1554	{0x00, 0x66, 0x20, 0xaa},
		1555	{0x00, 0x67, 0x2b, 0xaa},
		1556	{0x00, 0x68, 0x36, 0xaa},
		1557	{0x00, 0x69, 0x49, 0xaa},
		1558	{0x00, 0x6a, 0x5a, 0xaa},
		1559	{0x00, 0x6b, 0x7f, 0xaa},
		1560	{0x00, 0x6c, 0x9b, 0xaa},
		1561	{0x00, 0x6d, 0xba, 0xaa},
		1562	{0x00, 0x6e, 0xd4, 0xaa},
		1563	{0x00, 0x6f, 0xea, 0xaa},
		1564	{0x00, 0x70, 0x00, 0xaa},
		1565	{0x00, 0x71, 0x10, 0xaa},
		1566	{0x00, 0x72, 0x20, 0xaa},
		1567	{0x00, 0x73, 0x2b, 0xaa},
		1568	{0x00, 0x74, 0x36, 0xaa},
		1569	{0x00, 0x75, 0x49, 0xaa},
		1570	{0x00, 0x76, 0x5a, 0xaa},
		1571	{0x00, 0x77, 0x7f, 0xaa},
		1572	{0x00, 0x78, 0x9b, 0xaa},
		1573	{0x00, 0x79, 0xba, 0xaa},
		1574	{0x00, 0x7a, 0xd4, 0xaa},
		1575	{0x00, 0x7b, 0xea, 0xaa},
		1576	{0x00, 0x7c, 0x00, 0xaa},
		1577	{0x00, 0x7d, 0x10, 0xaa},
		1578	{0x00, 0x7e, 0x20, 0xaa},
		1579	{0x00, 0x7f, 0x2b, 0xaa},
		1580	{0x00, 0x80, 0x36, 0xaa},
		1581	{0x00, 0x81, 0x49, 0xaa},
		1582	{0x00, 0x82, 0x5a, 0xaa},
		1583	{0x00, 0x83, 0x7f, 0xaa},
		1584	{0x00, 0x84, 0x9b, 0xaa},
		1585	{0x00, 0x85, 0xba, 0xaa},
		1586	{0x00, 0x86, 0xd4, 0xaa},
		1587	{0x00, 0x87, 0xea, 0xaa},
		1588	{0x00, 0x57, 0x2a, 0xaa},
		1589	{0x00, 0x03, 0x01, 0xaa},
		1590	{0x00, 0x04, 0x10, 0xaa},
		1591	{0x00, 0x05, 0x10, 0xaa},
		1592	{0x00, 0x06, 0x10, 0xaa},
		1593	{0x00, 0x07, 0x10, 0xaa},
		1594	{0x00, 0x08, 0x13, 0xaa},
		1595	{0x00, 0x0a, 0x00, 0xaa},
		1596	{0x00, 0x0b, 0x10, 0xaa},
		1597	{0x00, 0x0c, 0x20, 0xaa},
		1598	{0x00, 0x0d, 0x18, 0xaa},
		1599	{0x00, 0x22, 0x01, 0xaa},
		1600	{0x00, 0x23, 0x60, 0xaa},
		1601	{0x00, 0x25, 0x08, 0xaa},
		1602	{0x00, 0x26, 0x82, 0xaa},
		1603	{0x00, 0x2e, 0x0f, 0xaa},
		1604	{0x00, 0x2f, 0x1e, 0xaa},
		1605	{0x00, 0x30, 0x2d, 0xaa},
		1606	{0x00, 0x31, 0x3c, 0xaa},
		1607	{0x00, 0x32, 0x4b, 0xaa},
		1608	{0x00, 0x33, 0x5a, 0xaa},
		1609	{0x00, 0x34, 0x69, 0xaa},
		1610	{0x00, 0x35, 0x78, 0xaa},
		1611	{0x00, 0x36, 0x87, 0xaa},
		1612	{0x00, 0x37, 0x96, 0xaa},
		1613	{0x00, 0x38, 0xa5, 0xaa},
		1614	{0x00, 0x39, 0xb4, 0xaa},
		1615	{0x00, 0x3a, 0xc3, 0xaa},
		1616	{0x00, 0x3b, 0xd2, 0xaa},
		1617	{0x00, 0x3c, 0xe1, 0xaa},
		1618	{0x00, 0x3e, 0xff, 0xaa},
		1619	{0x00, 0x3f, 0xff, 0xaa},
		1620	{0x00, 0x40, 0xff, 0xaa},
		1621	{0x00, 0x41, 0xff, 0xaa},
		1622	{0x00, 0x42, 0xff, 0xaa},
		1623	{0x00, 0x43, 0xff, 0xaa},
		1624	{0x00, 0x03, 0x00, 0xaa},
		1625	{0x00, 0x03, 0x00, 0xaa},
		1626	{0x00, 0x20, 0xc4, 0xaa},
		1627	{0x00, 0x13, 0x03, 0xaa},
		1628	{0x00, 0x3c, 0x50, 0xaa},
		1629	{0x00, 0x61, 0x6a, 0xaa},
		1630	{0x00, 0x51, 0x5b, 0xaa},
		1631	{0x00, 0x52, 0x91, 0xaa},
		1632	{0x00, 0x53, 0x4c, 0xaa},
		1633	{0x00, 0x54, 0x50, 0xaa},
		1634	{0x00, 0x56, 0x02, 0xaa},
		1635	{0xb6, 0x00, 0x00, 0xcc},
		1636	{0xb6, 0x03, 0x03, 0xcc},
		1637	{0xb6, 0x02, 0x20, 0xcc},
		1638	{0xb6, 0x05, 0x02, 0xcc},
		1639	{0xb6, 0x04, 0x58, 0xcc},
		1640	{0xb6, 0x12, 0xf8, 0xcc},
		1641	{0xb6, 0x13, 0x21, 0xcc},
		1642	{0xb6, 0x18, 0x03, 0xcc},
		1643	{0xb6, 0x17, 0xa9, 0xcc},
		1644	{0xb6, 0x16, 0x80, 0xcc},
		1645	{0xb6, 0x22, 0x12, 0xcc},
		1646	{0xb6, 0x23, 0x0b, 0xcc},
		1647	{0xbf, 0xc0, 0x39, 0xcc},
		1648	{0xbf, 0xc1, 0x04, 0xcc},
		1649	{0xbf, 0xcc, 0x00, 0xcc},
		1650	{0xb8, 0x06, 0x20, 0xcc},
		1651	{0xb8, 0x07, 0x03, 0xcc},
		1652	{0xb8, 0x08, 0x58, 0xcc},
		1653	{0xb8, 0x09, 0x02, 0xcc},
		1654	{0xb3, 0x01, 0x41, 0xcc},
		1655	{0x00, 0x03, 0x00, 0xaa},
		1656	{0x00, 0xd9, 0x0f, 0xaa},
		1657	{0x00, 0xda, 0xaa, 0xaa},
		1658	{0x00, 0xd9, 0x10, 0xaa},
		1659	{0x00, 0xda, 0xaa, 0xaa},
		1660	{0x00, 0xd9, 0x11, 0xaa},
		1661	{0x00, 0xda, 0x00, 0xaa},
		1662	{0x00, 0xd9, 0x12, 0xaa},
		1663	{0x00, 0xda, 0xff, 0xaa},
		1664	{0x00, 0xd9, 0x13, 0xaa},
		1665	{0x00, 0xda, 0xff, 0xaa},
		1666	{0x00, 0xe8, 0x11, 0xaa},
		1667	{0x00, 0xe9, 0x12, 0xaa},
		1668	{0x00, 0xea, 0x5c, 0xaa},
		1669	{0x00, 0xeb, 0xff, 0xaa},
		1670	{0x00, 0xd8, 0x80, 0xaa},
		1671	{0x00, 0xe6, 0x02, 0xaa},
		1672	{0x00, 0xd6, 0x40, 0xaa},
		1673	{0x00, 0xe3, 0x05, 0xaa},
		1674	{0x00, 0xe0, 0x40, 0xaa},
		1675	{0x00, 0xde, 0x03, 0xaa},
		1676	{0x00, 0xdf, 0x03, 0xaa},
		1677	{0x00, 0xdb, 0x02, 0xaa},
		1678	{0x00, 0xdc, 0x00, 0xaa},
		1679	{0x00, 0xdd, 0x03, 0xaa},
		1680	{0x00, 0xe1, 0x08, 0xaa},
		1681	{0x00, 0xe2, 0x01, 0xaa},
		1682	{0x00, 0xd6, 0x40, 0xaa},
		1683	{0x00, 0xe4, 0x40, 0xaa},
		1684	{0x00, 0xa8, 0x9f, 0xaa},
		1685	{0x00, 0xb4, 0x16, 0xaa},
		1686	{0xb0, 0x02, 0x06, 0xcc},
		1687	{0xb0, 0x18, 0x06, 0xcc},
		1688	{0xb0, 0x19, 0x06, 0xcc},
		1689	{0xb3, 0x5d, 0x18, 0xcc},
		1690	{0xb3, 0x05, 0x00, 0xcc},
		1691	{0xb3, 0x06, 0x00, 0xcc},
		1692	{0x00, 0xb4, 0x0e, 0xaa},
		1693	{0x00, 0xb5, 0x49, 0xaa},
		1694	{0x00, 0xb6, 0x1c, 0xaa},
		1695	{0x00, 0xb7, 0x96, 0xaa},
		1696	/* end of usbvm326.inf - start of ms-win trace */
		1697	{0xb6, 0x12, 0xf8, 0xcc},
		1698	{0xb6, 0x13, 0x3d, 0xcc},
		1699	/read b306/
		1700	{0x00, 0x03, 0x00, 0xaa},
		1701	{0x00, 0x1a, 0x09, 0xaa},
		1702	{0x00, 0x1b, 0x8a, 0xaa},
		1703	/read b827/
		1704	{0xb8, 0x27, 0x00, 0xcc},
		1705	{0xb8, 0x26, 0x60, 0xcc},
		1706	{0xb8, 0x26, 0x60, 0xcc},
		1707	/gamma - to do?/
		1708	{0x00, 0x03, 0x00, 0xaa},
		1709	{0x00, 0xae, 0x84, 0xaa},
		1710	/gamma again/
		1711	{0x00, 0x03, 0x00, 0xaa},
		1712	{0x00, 0x96, 0xa0, 0xaa},
		1713	/matrix/
		1714	{0x00, 0x03, 0x00, 0xaa},
		1715	{0x00, 0x91, 0x35, 0xaa},
		1716	{0x00, 0x92, 0x22, 0xaa},
		1717	/gamma/
		1718	{0x00, 0x03, 0x00, 0xaa},
		1719	{0x00, 0x95, 0x85, 0xaa},
		1720	/matrix/
		1721	{0x00, 0x03, 0x00, 0xaa},
		1722	{0x00, 0x61, 0xb8, 0xaa},
		1723	{0x00, 0x03, 0x00, 0xaa},
		1724	{0x00, 0x4d, 0x20, 0xaa},
		1725	{0xb8, 0x22, 0x40, 0xcc},
		1726	{0xb8, 0x23, 0x40, 0xcc},
		1727	{0xb8, 0x24, 0x40, 0xcc},
		1728	{0xb8, 0x81, 0x09, 0xcc},
		1729	{0x00, 0x00, 0x64, 0xdd},
		1730	{0x00, 0x03, 0x01, 0xaa},
		1731	/read 46/
		1732	{0x00, 0x46, 0x3c, 0xaa},
		1733	{0x00, 0x03, 0x00, 0xaa},
		1734	{0x00, 0x16, 0x40, 0xaa},
		1735	{0x00, 0x17, 0x40, 0xaa},
		1736	{0x00, 0x18, 0x40, 0xaa},
		1737	{0x00, 0x19, 0x41, 0xaa},
		1738	{0x00, 0x03, 0x01, 0xaa},
		1739	{0x00, 0x46, 0x3c, 0xaa},
		1740	{0x00, 0x00, 0x18, 0xdd},
		1741	/read bfff/
		1742	{0x00, 0x03, 0x00, 0xaa},
		1743	{0x00, 0x1e, 0x46, 0xaa},
		1744	{0x00, 0xa8, 0x8f, 0xaa},
		1745	{0x00, 0x03, 0x00, 0xaa},
		1746	{0x00, 0xb4, 0x1c, 0xaa},
		1747	{0x00, 0xb5, 0x92, 0xaa},
		1748	{0x00, 0xb6, 0x39, 0xaa},
		1749	{0x00, 0xb7, 0x24, 0xaa},
		1750	/write 89 0400 1415/
		1751	};
		1752
1469	struct sensor_info {	1753	struct sensor_info {
1470	int sensorId;	1754	int sensorId;
1471	__u8 I2cAdd;	1755	__u8 I2cAdd;
@@ -1486,6 +1770,7 @@ static const struct sensor_info sensor_info_data[] = {
1486	{SENSOR_MI1310_SOC, 0x80 \| 0x5d, 0x00, 0x143a, 0x24, 0x25, 0x01},	1770	{SENSOR_MI1310_SOC, 0x80 \| 0x5d, 0x00, 0x143a, 0x24, 0x25, 0x01},
1487	/* (tested in vc032x_probe_sensor) */	1771	/* (tested in vc032x_probe_sensor) */
1488	/* {SENSOR_MI0360, 0x80 \| 0x5d, 0x00, 0x8243, 0x24, 0x25, 0x01}, */	1772	/* {SENSOR_MI0360, 0x80 \| 0x5d, 0x00, 0x8243, 0x24, 0x25, 0x01}, */
		1773	{SENSOR_PO1200, 0x80 \| 0x5c, 0x00, 0x1200, 0x67, 0x67, 0x01},
1489	};	1774	};
1490		1775
1491	/* read 'len' bytes in gspca_dev->usb_buf */	1776	/* read 'len' bytes in gspca_dev->usb_buf */
@@ -1709,6 +1994,9 @@ static int sd_config(struct gspca_dev *gspca_dev,
1709	case SENSOR_OV7670:	1994	case SENSOR_OV7670:
1710	PDEBUG(D_PROBE, "Find Sensor OV7670");	1995	PDEBUG(D_PROBE, "Find Sensor OV7670");
1711	break;	1996	break;
		1997	case SENSOR_PO1200:
		1998	PDEBUG(D_PROBE, "Find Sensor PO1200");
		1999	break;
1712	case SENSOR_PO3130NC:	2000	case SENSOR_PO3130NC:
1713	PDEBUG(D_PROBE, "Find Sensor PO3130NC");	2001	PDEBUG(D_PROBE, "Find Sensor PO3130NC");
1714	break;	2002	break;
@@ -1719,8 +2007,13 @@ static int sd_config(struct gspca_dev *gspca_dev,
1719	cam->cam_mode = vc0321_mode;	2007	cam->cam_mode = vc0321_mode;
1720	cam->nmodes = ARRAY_SIZE(vc0321_mode);	2008	cam->nmodes = ARRAY_SIZE(vc0321_mode);
1721	} else {	2009	} else {
1722	cam->cam_mode = vc0323_mode;	2010	if (sensor != SENSOR_PO1200) {
1723	cam->nmodes = ARRAY_SIZE(vc0323_mode);	2011	cam->cam_mode = vc0323_mode;
		2012	cam->nmodes = ARRAY_SIZE(vc0323_mode);
		2013	} else {
		2014	cam->cam_mode = svga_mode;
		2015	cam->nmodes = ARRAY_SIZE(svga_mode);
		2016	}
1724	}	2017	}
1725		2018
1726	sd->qindex = 7;	2019	sd->qindex = 7;
@@ -1888,6 +2181,11 @@ static int sd_start(struct gspca_dev *gspca_dev)
1888	}	2181	}
1889	usb_exchange(gspca_dev, po3130_rundata);	2182	usb_exchange(gspca_dev, po3130_rundata);
1890	break;	2183	break;
		2184	case SENSOR_PO1200:
		2185	GammaT = po1200_gamma;
		2186	MatrixT = po1200_matrix;
		2187	usb_exchange(gspca_dev, po1200_initVGA_data);
		2188	break;
1891	default:	2189	default:
1892	PDEBUG(D_PROBE, "Damned !! no sensor found Bye");	2190	PDEBUG(D_PROBE, "Damned !! no sensor found Bye");
1893	return -EMEDIUMTYPE;	2191	return -EMEDIUMTYPE;
@@ -1920,11 +2218,15 @@ static int sd_start(struct gspca_dev *gspca_dev)
1920	reg_w(gspca_dev->dev, 0xa0, 0x23, 0xb800); * ISP CTRL_BAS	2218	reg_w(gspca_dev->dev, 0xa0, 0x23, 0xb800); * ISP CTRL_BAS
1921	*/	2219	*/
1922	/* set the led on 0x0892 0x0896 */	2220	/* set the led on 0x0892 0x0896 */
1923	reg_w(gspca_dev->dev, 0x89, 0xffff, 0xfdff);	2221	if (sd->sensor != SENSOR_PO1200) {
1924	msleep(100);	2222	reg_w(gspca_dev->dev, 0x89, 0xffff, 0xfdff);
1925	setquality(gspca_dev);	2223	msleep(100);
1926	sethvflip(gspca_dev);	2224	setquality(gspca_dev);
1927	setlightfreq(gspca_dev);	2225	sethvflip(gspca_dev);
		2226	setlightfreq(gspca_dev);
		2227	} else {
		2228	reg_w(gspca_dev->dev, 0x89, 0x0400, 0x1415);
		2229	}
1928	}	2230	}
1929	return 0;	2231	return 0;
1930	}	2232	}
@@ -2071,6 +2373,7 @@ static const __devinitdata struct usb_device_id device_table[] = {
2071	{USB_DEVICE(0x0ac8, 0x0328), .driver_info = BRIDGE_VC0321},	2373	{USB_DEVICE(0x0ac8, 0x0328), .driver_info = BRIDGE_VC0321},
2072	{USB_DEVICE(0x0ac8, 0xc001), .driver_info = BRIDGE_VC0321},	2374	{USB_DEVICE(0x0ac8, 0xc001), .driver_info = BRIDGE_VC0321},
2073	{USB_DEVICE(0x0ac8, 0xc002), .driver_info = BRIDGE_VC0321},	2375	{USB_DEVICE(0x0ac8, 0xc002), .driver_info = BRIDGE_VC0321},
		2376	{USB_DEVICE(0x15b8, 0x6002), .driver_info = BRIDGE_VC0323},
2074	{USB_DEVICE(0x17ef, 0x4802), .driver_info = BRIDGE_VC0323},	2377	{USB_DEVICE(0x17ef, 0x4802), .driver_info = BRIDGE_VC0323},
2075	{}	2378	{}
2076	};	2379	};