V4L/DVB: gspca - sonixj: Add webcam 0c45:6142 with sensors gc0307 and po2030n

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

diff --git a/Documentation/video4linux/gspca.txt b/Documentation/video4linux/gspca.txt
index 181b9e6..9475e1e 100644 (file)
--- a/Documentation/video4linux/gspca.txt
+++ b/Documentation/video4linux/gspca.txt
@@ -305,6 +305,7 @@ sonixj              0c45:6138       Sn9c120 Mo4000
 sonixj         0c45:613a       Microdia Sonix PC Camera
 sonixj         0c45:613b       Surfer SN-206
 sonixj         0c45:613c       Sonix Pccam168
+sonixj         0c45:6142       Hama PC-Webcam AC-150
 sonixj         0c45:6143       Sonix Pccam168
 sonixj         0c45:6148       Digitus DA-70811/ZSMC USB PC Camera ZS211/Microdia
 sonixj         0c45:614a       Frontech E-Ccam (JIL-2225)

diff --git a/drivers/media/video/gspca/sonixj.c b/drivers/media/video/gspca/sonixj.c
index 20ca161..aaa68dd 100644 (file)
--- a/drivers/media/video/gspca/sonixj.c
+++ b/drivers/media/video/gspca/sonixj.c
@@ -69,6 +69,7 @@ struct sd {
        u8 sensor;                      /* Type of image sensor chip */
 enum {
        SENSOR_ADCM1700,
+       SENSOR_GC0307,
        SENSOR_HV7131R,
        SENSOR_MI0360,
        SENSOR_MO4000,
@@ -78,6 +79,7 @@ enum {
        SENSOR_OV7648,
        SENSOR_OV7660,
        SENSOR_PO1030,
+       SENSOR_PO2030N,
        SENSOR_SP80708,
 } sensors;
        u8 i2c_addr;
@@ -289,6 +291,11 @@ static const __u32 ctrl_dis[] = {
                        (1 << VFLIP_IDX) |
                        (1 << FREQ_IDX),
 
+[SENSOR_GC0307] =      (1 << AUTOGAIN_IDX) |
+                       (1 << INFRARED_IDX) |
+                       (1 << VFLIP_IDX) |
+                       (1 << FREQ_IDX),
+
 [SENSOR_HV7131R] =     (1 << INFRARED_IDX) |
                        (1 << FREQ_IDX),
 
@@ -320,6 +327,11 @@ static const __u32 ctrl_dis[] = {
                        (1 << VFLIP_IDX) |
                        (1 << FREQ_IDX),
 
+[SENSOR_PO2030N] =     (1 << AUTOGAIN_IDX) |
+                       (1 << INFRARED_IDX) |
+                       (1 << VFLIP_IDX) |
+                       (1 << FREQ_IDX),
+
 [SENSOR_SP80708] =     (1 << AUTOGAIN_IDX) |
                        (1 << INFRARED_IDX) |
                        (1 << VFLIP_IDX) |
@@ -363,7 +375,17 @@ static const u8 sn_adcm1700[0x1c] = {
        0x06,   0x00,   0x00,   0x00
 };
 
-/*Data from sn9c102p+hv7131r */
+static const u8 sn_gc0307[0x1c] = {
+/*     reg0    reg1    reg2    reg3    reg4    reg5    reg6    reg7 */
+       0x00,   0x61,   0x62,   0x00,   0x1a,   0x00,   0x00,   0x00,
+/*     reg8    reg9    rega    regb    regc    regd    rege    regf */
+       0x80,   0x21,   0x00,   0x00,   0x00,   0x00,   0x00,   0x00,
+/*     reg10   reg11   reg12   reg13   reg14   reg15   reg16   reg17 */
+       0x03,   0x00,   0x03,   0x01,   0x08,   0x28,   0x1e,   0x02,
+/*     reg18   reg19   reg1a   reg1b */
+       0x06,   0x00,   0x00,   0x00
+};
+
 static const u8 sn_hv7131[0x1c] = {
 /*     reg0    reg1    reg2    reg3    reg4    reg5    reg6    reg7 */
        0x00,   0x03,   0x64,   0x00,   0x1a,   0x20,   0x20,   0x20,
@@ -463,6 +485,17 @@ static const u8 sn_po1030[0x1c] = {
        0x07,   0x00,   0x00,   0x00
 };
 
+static const u8 sn_po2030n[0x1c] = {
+/*     reg0    reg1    reg2    reg3    reg4    reg5    reg6    reg7 */
+       0x00,   0x63,   0x40,   0x00,   0x1a,   0x00,   0x00,   0x00,
+/*     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,   0x01,   0x14,   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,
@@ -477,6 +510,7 @@ static const u8 sn_sp80708[0x1c] = {
 /* sequence specific to the sensors - !! index = SENSOR_xxx */
 static const u8 *sn_tb[] = {
 [SENSOR_ADCM1700] =    sn_adcm1700,
+[SENSOR_GC0307] =      sn_gc0307,
 [SENSOR_HV7131R] =     sn_hv7131,
 [SENSOR_MI0360] =      sn_mi0360,
 [SENSOR_MO4000] =      sn_mo4000,
@@ -486,6 +520,7 @@ static const u8 *sn_tb[] = {
 [SENSOR_OV7648] =      sn_ov7648,
 [SENSOR_OV7660] =      sn_ov7660,
 [SENSOR_PO1030] =      sn_po1030,
+[SENSOR_PO2030N] =     sn_po2030n,
 [SENSOR_SP80708] =     sn_sp80708
 };
 
@@ -504,8 +539,13 @@ static const u8 gamma_spec_1[17] = {
        0x08, 0x3a, 0x52, 0x65, 0x75, 0x83, 0x91, 0x9d,
        0xa9, 0xb4, 0xbe, 0xc8, 0xd2, 0xdb, 0xe4, 0xed, 0xf5
 };
-/* gamma for sensor SP80708 */
+/* gamma for sensor GC0307 */
 static const u8 gamma_spec_2[17] = {
+       0x14, 0x37, 0x50, 0x6a, 0x7c, 0x8d, 0x9d, 0xab,
+       0xb5, 0xbf, 0xc2, 0xcb, 0xd1, 0xd6, 0xdb, 0xe1, 0xeb
+};
+/* gamma for sensor SP80708 */
+static const u8 gamma_spec_3[17] = {
        0x0a, 0x2d, 0x4e, 0x68, 0x7d, 0x8f, 0x9f, 0xab,
        0xb7, 0xc2, 0xcc, 0xd3, 0xd8, 0xde, 0xe2, 0xe5, 0xe6
 };
@@ -553,6 +593,64 @@ static const u8 adcm1700_sensor_param1[][8] = {
        {0xb0, 0x51, 0x32, 0x00, 0xa2, 0x00, 0x00, 0x10},
        {}
 };
+static const u8 gc0307_sensor_init[][8] = {
+       {0xa0, 0x21, 0x43, 0x00, 0x00, 0x00, 0x00, 0x10},
+       {0xa0, 0x21, 0x44, 0xa2, 0x00, 0x00, 0x00, 0x10},
+       {0xa0, 0x21, 0x01, 0x6a, 0x00, 0x00, 0x00, 0x10},
+       {0xa0, 0x21, 0x02, 0x70, 0x00, 0x00, 0x00, 0x10},
+       {0xa0, 0x21, 0x10, 0x00, 0x00, 0x00, 0x00, 0x10},
+       {0xa0, 0x21, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x10},
+       {0xa0, 0x21, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x10},
+       {0xa0, 0x21, 0x11, 0x05, 0x00, 0x00, 0x00, 0x10},
+       {0xa0, 0x21, 0x05, 0x00, 0x00, 0x00, 0x00, 0x10},
+       {0xa0, 0x21, 0x06, 0x00, 0x00, 0x00, 0x00, 0x10},
+       {0xa0, 0x21, 0x07, 0x00, 0x00, 0x00, 0x00, 0x10},
+       {0xa0, 0x21, 0x08, 0x02, 0x00, 0x00, 0x00, 0x10},
+       {0xa0, 0x21, 0x09, 0x01, 0x00, 0x00, 0x00, 0x10},
+       {0xa0, 0x21, 0x0a, 0xe8, 0x00, 0x00, 0x00, 0x10},
+       {0xa0, 0x21, 0x0b, 0x02, 0x00, 0x00, 0x00, 0x10},
+       {0xa0, 0x21, 0x0c, 0x80, 0x00, 0x00, 0x00, 0x10},
+       {0xa0, 0x21, 0x0d, 0x22, 0x00, 0x00, 0x00, 0x10},
+       {0xa0, 0x21, 0x0e, 0x02, 0x00, 0x00, 0x00, 0x10},
+       {0xa0, 0x21, 0x0f, 0xb2, 0x00, 0x00, 0x00, 0x10},
+       {0xa0, 0x21, 0x12, 0x70, 0x00, 0x00, 0x00, 0x10},
+       {0xdd, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, /*delay 10ms*/
+       {0xa0, 0x21, 0x13, 0x00, 0x00, 0x00, 0x00, 0x10},
+       {0xa0, 0x21, 0x15, 0xb8, 0x00, 0x00, 0x00, 0x10},
+       {0xa0, 0x21, 0x16, 0x13, 0x00, 0x00, 0x00, 0x10},
+       {0xa0, 0x21, 0x17, 0x52, 0x00, 0x00, 0x00, 0x10},
+       {0xa0, 0x21, 0x18, 0x50, 0x00, 0x00, 0x00, 0x10},
+       {0xa0, 0x21, 0x1e, 0x0d, 0x00, 0x00, 0x00, 0x10},
+       {0xa0, 0x21, 0x1f, 0x32, 0x00, 0x00, 0x00, 0x10},
+       {0xa0, 0x21, 0x61, 0x90, 0x00, 0x00, 0x00, 0x10},
+       {0xa0, 0x21, 0x63, 0x70, 0x00, 0x00, 0x00, 0x10},
+       {0xa0, 0x21, 0x65, 0x98, 0x00, 0x00, 0x00, 0x10},
+       {0xa0, 0x21, 0x67, 0x90, 0x00, 0x00, 0x00, 0x10},
+       {0xa0, 0x21, 0x03, 0x00, 0x00, 0x00, 0x00, 0x10},
+       {0xa0, 0x21, 0x04, 0x96, 0x00, 0x00, 0x00, 0x10},
+       {0xa0, 0x21, 0x45, 0x27, 0x00, 0x00, 0x00, 0x10},
+       {0xa0, 0x21, 0x47, 0x2c, 0x00, 0x00, 0x00, 0x10},
+       {0xa0, 0x21, 0x43, 0x47, 0x00, 0x00, 0x00, 0x10},
+       {0xa0, 0x21, 0x44, 0xd8, 0x00, 0x00, 0x00, 0x10},
+       {}
+};
+static const u8 gc0307_sensor_param1[][8] = {
+       {0xa0, 0x21, 0x68, 0x13, 0x00, 0x00, 0x00, 0x10},
+       {0xd0, 0x21, 0x61, 0x80, 0x00, 0x80, 0x00, 0x10},
+       {0xc0, 0x21, 0x65, 0x80, 0x00, 0x80, 0x00, 0x10},
+       {0xc0, 0x21, 0x63, 0xa0, 0x00, 0xa6, 0x00, 0x10},
+/*param3*/
+       {0xa0, 0x21, 0x01, 0x6e, 0x00, 0x00, 0x00, 0x10},
+       {0xa0, 0x21, 0x02, 0x88, 0x00, 0x00, 0x00, 0x10},
+
+       {0xa0, 0x21, 0x68, 0x22, 0x00, 0x00, 0x00, 0x10},
+       {0xdd, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+       {0xa0, 0x21, 0x03, 0x07, 0x00, 0x00, 0x00, 0x10},
+       {0xdd, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+       {0xa0, 0x21, 0x04, 0x91, 0x00, 0x00, 0x00, 0x10},
+       {}
+};
+
 static const u8 hv7131r_sensor_init[][8] = {
        {0xc1, 0x11, 0x01, 0x08, 0x01, 0x00, 0x00, 0x10},
        {0xb1, 0x11, 0x34, 0x17, 0x7f, 0x00, 0x00, 0x10},
@@ -1004,6 +1102,82 @@ static const u8 po1030_sensor_param1[][8] = {
        {}
 };
 
+static const u8 po2030n_sensor_init[][8] = {
+       {0xa1, 0x6e, 0x1e, 0x1a, 0x00, 0x00, 0x00, 0x10},
+       {0xa1, 0x6e, 0x1f, 0x99, 0x00, 0x00, 0x00, 0x10},
+       {0xdd, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, /* delay 10ms */
+       {0xa1, 0x6e, 0x1e, 0x0a, 0x00, 0x00, 0x00, 0x10},
+       {0xa1, 0x6e, 0x1f, 0x19, 0x00, 0x00, 0x00, 0x10},
+       {0xdd, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, /* delay 10ms */
+       {0xa1, 0x6e, 0x20, 0x44, 0x00, 0x00, 0x00, 0x10},
+       {0xa1, 0x6e, 0x04, 0x03, 0x00, 0x00, 0x00, 0x10},
+       {0xa1, 0x6e, 0x05, 0x70, 0x00, 0x00, 0x00, 0x10},
+       {0xa1, 0x6e, 0x06, 0x02, 0x00, 0x00, 0x00, 0x10},
+       {0xa1, 0x6e, 0x07, 0x25, 0x00, 0x00, 0x00, 0x10},
+       {0xd1, 0x6e, 0x08, 0x00, 0xd0, 0x00, 0x08, 0x10},
+       {0xd1, 0x6e, 0x0c, 0x03, 0x50, 0x01, 0xe8, 0x10},
+       {0xd1, 0x6e, 0x1d, 0x20, 0x0a, 0x19, 0x44, 0x10},
+       {0xd1, 0x6e, 0x21, 0x00, 0x00, 0x00, 0x00, 0x10},
+       {0xd1, 0x6e, 0x25, 0x00, 0x00, 0x00, 0x00, 0x10},
+       {0xd1, 0x6e, 0x29, 0x00, 0x00, 0x00, 0x00, 0x10},
+       {0xd1, 0x6e, 0x2d, 0x00, 0x00, 0x00, 0x00, 0x10},
+       {0xd1, 0x6e, 0x31, 0x00, 0x00, 0x00, 0x00, 0x10},
+       {0xd1, 0x6e, 0x35, 0x00, 0x00, 0x00, 0x00, 0x10},
+       {0xd1, 0x6e, 0x39, 0x00, 0x00, 0x00, 0x00, 0x10},
+       {0xd1, 0x6e, 0x3d, 0x00, 0x00, 0x00, 0x00, 0x10},
+       {0xd1, 0x6e, 0x41, 0x00, 0x00, 0x00, 0x00, 0x10},
+       {0xd1, 0x6e, 0x45, 0x00, 0x00, 0x00, 0x00, 0x10},
+       {0xd1, 0x6e, 0x49, 0x00, 0x00, 0x00, 0x00, 0x10},
+       {0xd1, 0x6e, 0x4d, 0x00, 0x00, 0x00, 0xed, 0x10},
+       {0xd1, 0x6e, 0x51, 0x17, 0x4a, 0x2f, 0xc0, 0x10},
+       {0xd1, 0x6e, 0x55, 0x00, 0x00, 0x00, 0x00, 0x10},
+       {0xd1, 0x6e, 0x59, 0x00, 0x00, 0x00, 0x00, 0x10},
+       {0xd1, 0x6e, 0x5d, 0x00, 0x00, 0x00, 0x00, 0x10},
+       {0xd1, 0x6e, 0x61, 0x00, 0x00, 0x00, 0x00, 0x10},
+       {0xd1, 0x6e, 0x65, 0x00, 0x00, 0x00, 0x00, 0x10},
+       {0xd1, 0x6e, 0x69, 0x00, 0x00, 0x00, 0x00, 0x10},
+       {0xd1, 0x6e, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x10},
+       {0xd1, 0x6e, 0x71, 0x00, 0x00, 0x00, 0x00, 0x10},
+       {0xd1, 0x6e, 0x75, 0x00, 0x00, 0x00, 0x00, 0x10},
+       {0xd1, 0x6e, 0x79, 0x00, 0x00, 0x00, 0x00, 0x10},
+       {0xd1, 0x6e, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x10},
+       {0xd1, 0x6e, 0x81, 0x00, 0x00, 0x00, 0x00, 0x10},
+       {0xd1, 0x6e, 0x85, 0x00, 0x00, 0x00, 0x08, 0x10},
+       {0xd1, 0x6e, 0x89, 0x01, 0xe8, 0x00, 0x01, 0x10},
+       {0xa1, 0x6e, 0x8d, 0x00, 0x00, 0x00, 0x00, 0x10},
+       {0xd1, 0x6e, 0x21, 0x00, 0x00, 0x00, 0x00, 0x10},
+       {0xd1, 0x6e, 0x25, 0x00, 0x00, 0x00, 0x01, 0x10},
+       {0xd1, 0x6e, 0x29, 0xe6, 0x00, 0xbd, 0x03, 0x10},
+       {0xd1, 0x6e, 0x2d, 0x41, 0x38, 0x68, 0x40, 0x10},
+       {0xd1, 0x6e, 0x31, 0x2b, 0x00, 0x36, 0x00, 0x10},
+       {0xd1, 0x6e, 0x35, 0x30, 0x30, 0x08, 0x00, 0x10},
+       {0xd1, 0x6e, 0x39, 0x00, 0x00, 0x33, 0x06, 0x10},
+       {0xb1, 0x6e, 0x3d, 0x06, 0x02, 0x00, 0x00, 0x10},
+       {}
+};
+static const u8 po2030n_sensor_param1[][8] = {
+       {0xa1, 0x6e, 0x1a, 0x01, 0x00, 0x00, 0x00, 0x10},
+       {0xdd, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, /* delay 8ms */
+       {0xa1, 0x6e, 0x1b, 0xf4, 0x00, 0x00, 0x00, 0x10},
+       {0xa1, 0x6e, 0x15, 0x04, 0x00, 0x00, 0x00, 0x10},
+       {0xd1, 0x6e, 0x16, 0x50, 0x40, 0x49, 0x40, 0x10},
+/*param2*/
+       {0xa1, 0x6e, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x10},
+       {0xa1, 0x6e, 0x04, 0x03, 0x00, 0x00, 0x00, 0x10},
+       {0xa1, 0x6e, 0x05, 0x6f, 0x00, 0x00, 0x00, 0x10},
+       {0xa1, 0x6e, 0x06, 0x02, 0x00, 0x00, 0x00, 0x10},
+       {0xa1, 0x6e, 0x07, 0x25, 0x00, 0x00, 0x00, 0x10},
+       {0xa1, 0x6e, 0x15, 0x04, 0x00, 0x00, 0x00, 0x10},
+       {0xc1, 0x6e, 0x16, 0x52, 0x40, 0x48, 0x00, 0x10},
+/*after start*/
+       {0xa1, 0x6e, 0x15, 0x0f, 0x00, 0x00, 0x00, 0x10},
+       {0xdd, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, /* delay 5ms */
+       {0xa1, 0x6e, 0x1a, 0x05, 0x00, 0x00, 0x00, 0x10},
+       {0xdd, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, /* delay 5ms */
+       {0xa1, 0x6e, 0x1b, 0x53, 0x00, 0x00, 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},
@@ -1091,6 +1265,7 @@ static const u8 sp80708_sensor_param1[][8] = {
 
 static const u8 (*sensor_init[])[8] = {
 [SENSOR_ADCM1700] =    adcm1700_sensor_init,
+[SENSOR_GC0307] =      gc0307_sensor_init,
 [SENSOR_HV7131R] =     hv7131r_sensor_init,
 [SENSOR_MI0360] =      mi0360_sensor_init,
 [SENSOR_MO4000] =      mo4000_sensor_init,
@@ -1100,6 +1275,7 @@ static const u8 (*sensor_init[])[8] = {
 [SENSOR_OV7648] =      ov7648_sensor_init,
 [SENSOR_OV7660] =      ov7660_sensor_init,
 [SENSOR_PO1030] =      po1030_sensor_init,
+[SENSOR_PO2030N] =     po2030n_sensor_init,
 [SENSOR_SP80708] =     sp80708_sensor_init,
 };
 
@@ -1169,7 +1345,8 @@ static void i2c_w1(struct gspca_dev *gspca_dev, u8 reg, u8 val)
        PDEBUG(D_USBO, "i2c_w2 [%02x] = %02x", reg, val);
        switch (sd->sensor) {
        case SENSOR_ADCM1700:
-       case SENSOR_OM6802:             /* i2c command = a0 (100 kHz) */
+       case SENSOR_OM6802:
+       case SENSOR_GC0307:             /* i2c command = a0 (100 kHz) */
                gspca_dev->usb_buf[0] = 0x80 | (2 << 4);
                break;
        default:                        /* i2c command = a1 (400 kHz) */
@@ -1216,7 +1393,8 @@ static void i2c_r(struct gspca_dev *gspca_dev, u8 reg, int len)
 
        switch (sd->sensor) {
        case SENSOR_ADCM1700:
-       case SENSOR_OM6802:             /* i2c command = 90 (100 kHz) */
+       case SENSOR_OM6802:
+       case SENSOR_GC0307:             /* i2c command = a0 (100 kHz) */
                mode[0] = 0x80 | 0x10;
                break;
        default:                        /* i2c command = 91 (400 kHz) */
@@ -1355,6 +1533,46 @@ static void ov7648_probe(struct gspca_dev *gspca_dev)
                gspca_dev->usb_buf[3], gspca_dev->usb_buf[4]);
 }
 
+/* 0c45:6142 sensor may be po2030n, gc0305 or gc0307 */
+static void po2030n_probe(struct gspca_dev *gspca_dev)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+
+       /* check gc0307 */
+       reg_w1(gspca_dev, 0x17, 0x62);
+       reg_w1(gspca_dev, 0x01, 0x08);
+       reg_w1(gspca_dev, 0x02, 0x22);
+       sd->i2c_addr = 0x21;
+       i2c_r(gspca_dev, 0x00, 1);
+
+       reg_w1(gspca_dev, 0x01, 0x29);          /* reset */
+       reg_w1(gspca_dev, 0x17, 0x42);
+
+       if (gspca_dev->usb_buf[4] == 0x99) {    /* gc0307 (?) */
+               PDEBUG(D_PROBE, "Sensor gc0307");
+               sd->sensor = SENSOR_GC0307;
+               return;
+       }
+
+       /* check po2030n */
+       reg_w1(gspca_dev, 0x17, 0x62);
+       reg_w1(gspca_dev, 0x01, 0x0a);
+       sd->i2c_addr = 0x6e;
+       i2c_r(gspca_dev, 0x00, 2);
+
+       reg_w1(gspca_dev, 0x01, 0x29);
+       reg_w1(gspca_dev, 0x17, 0x42);
+
+       if (gspca_dev->usb_buf[3] == 0x20
+        && gspca_dev->usb_buf[4] == 0x30)
+               PDEBUG(D_PROBE, "Sensor po2030n");
+/*             sd->sensor = SENSOR_PO2030N; */
+       else
+               PDEBUG(D_PROBE, "Unknown sensor ID %02x%02x",
+                       gspca_dev->usb_buf[3],
+                       gspca_dev->usb_buf[4]);
+}
+
 static void bridge_init(struct gspca_dev *gspca_dev,
                          const u8 *sn9c1xx)
 {
@@ -1375,8 +1593,10 @@ static void bridge_init(struct gspca_dev *gspca_dev,
        reg_w(gspca_dev, 0x08, &sn9c1xx[8], 2);
        reg_w(gspca_dev, 0x17, &sn9c1xx[0x17], 5);
        switch (sd->sensor) {
+       case SENSOR_GC0307:
        case SENSOR_OV7660:
        case SENSOR_PO1030:
+       case SENSOR_PO2030N:
        case SENSOR_SP80708:
                reg9a = reg9a_spec;
                break;
@@ -1397,6 +1617,14 @@ static void bridge_init(struct gspca_dev *gspca_dev,
                reg_w1(gspca_dev, 0x01, 0x42);
                reg_w1(gspca_dev, 0x01, 0x42);
                break;
+       case SENSOR_GC0307:
+               msleep(50);
+               reg_w1(gspca_dev, 0x01, 0x61);
+               reg_w1(gspca_dev, 0x17, 0x22);
+               reg_w1(gspca_dev, 0x01, 0x60);
+               reg_w1(gspca_dev, 0x01, 0x40);
+               msleep(50);
+               break;
        case SENSOR_MT9V111:
                reg_w1(gspca_dev, 0x01, 0x61);
                reg_w1(gspca_dev, 0x17, 0x61);
@@ -1439,6 +1667,12 @@ static void bridge_init(struct gspca_dev *gspca_dev,
                reg_w1(gspca_dev, 0x01, 0x60);
                reg_w1(gspca_dev, 0x01, 0x40);
                break;
+       case SENSOR_PO2030N:
+               reg_w1(gspca_dev, 0x01, 0x63);
+               reg_w1(gspca_dev, 0x17, 0x20);
+               reg_w1(gspca_dev, 0x01, 0x62);
+               reg_w1(gspca_dev, 0x01, 0x42);
+               break;
        case SENSOR_OV7660:
                /* fall thru */
        case SENSOR_SP80708:
@@ -1546,6 +1780,9 @@ static int sd_init(struct gspca_dev *gspca_dev)
                case SENSOR_OV7648:
                        ov7648_probe(gspca_dev);
                        break;
+               case SENSOR_PO2030N:
+                       po2030n_probe(gspca_dev);
+                       break;
                }
                regGpio[1] = 0x70;
                reg_w(gspca_dev, 0x01, regGpio, 2);
@@ -1764,9 +2001,12 @@ static void setgamma(struct gspca_dev *gspca_dev)
        case SENSOR_MT9V111:
                gamma_base = gamma_spec_1;
                break;
-       case SENSOR_SP80708:
+       case SENSOR_GC0307:
                gamma_base = gamma_spec_2;
                break;
+       case SENSOR_SP80708:
+               gamma_base = gamma_spec_3;
+               break;
        default:
                gamma_base = gamma_def;
                break;
@@ -1957,9 +2197,15 @@ static int sd_start(struct gspca_dev *gspca_dev)
        static const u8 CA[] = { 0x28, 0xd8, 0x14, 0xec };
        static const u8 CA_adcm1700[] =
                                { 0x14, 0xec, 0x0a, 0xf6 };
+       static const u8 CA_po2030n[] =
+                               { 0x1e, 0xe2, 0x14, 0xec };
        static const u8 CE[] = { 0x32, 0xdd, 0x2d, 0xdd };      /* MI0360 */
+       static const u8 CE_gc0307[] =
+                               { 0x32, 0xce, 0x2d, 0xd3 };
        static const u8 CE_ov76xx[] =
                                { 0x32, 0xdd, 0x32, 0xdd };
+       static const u8 CE_po2030n[] =
+                               { 0x14, 0xe7, 0x1e, 0xdd };
 
        /* create the JPEG header */
        sd->jpeg_hdr = kmalloc(JPEG_HDR_SZ, GFP_KERNEL);
@@ -2016,6 +2262,9 @@ static int sd_start(struct gspca_dev *gspca_dev)
        }
        reg_w1(gspca_dev, 0x18, sn9c1xx[0x18]);
        switch (sd->sensor) {
+       case SENSOR_GC0307:
+               reg17 = 0xa2;
+               break;
        case SENSOR_MT9V111:
                reg17 = 0xe0;
                break;
@@ -2030,6 +2279,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
                reg17 = 0xa0;
                break;
        case SENSOR_PO1030:
+       case SENSOR_PO2030N:
                reg17 = 0xa0;
                break;
        default:
@@ -2054,12 +2304,16 @@ static int sd_start(struct gspca_dev *gspca_dev)
        case SENSOR_SP80708:
                reg_w1(gspca_dev, 0x9a, 0x05);
                break;
+       case SENSOR_GC0307:
        case SENSOR_MT9V111:
                reg_w1(gspca_dev, 0x9a, 0x07);
                break;
        case SENSOR_OV7648:
                reg_w1(gspca_dev, 0x9a, 0x0a);
                break;
+       case SENSOR_PO2030N:
+               reg_w1(gspca_dev, 0x9a, 0x06);
+               break;
        default:
                reg_w1(gspca_dev, 0x9a, 0x08);
                break;
@@ -2084,6 +2338,11 @@ static int sd_start(struct gspca_dev *gspca_dev)
                reg1 = 0x46;
                reg17 = 0xe2;
                break;
+       case SENSOR_GC0307:
+               init = gc0307_sensor_param1;
+               reg17 = 0xa2;
+               reg1 = 0x44;
+               break;
        case SENSOR_MO4000:
                if (mode) {
 /*                     reg1 = 0x46;     * 320 clk 48Mhz 60fp/s */
@@ -2133,6 +2392,11 @@ static int sd_start(struct gspca_dev *gspca_dev)
                reg17 = 0xa2;
                reg1 = 0x44;
                break;
+       case SENSOR_PO2030N:
+               init = po2030n_sensor_param1;
+               reg1 = 0x46;
+               reg17 = 0xa2;
+               break;
        default:
 /*     case SENSOR_SP80708: */
                init = sp80708_sensor_param1;
@@ -2152,10 +2416,18 @@ static int sd_start(struct gspca_dev *gspca_dev)
        }
 
        reg_w(gspca_dev, 0xc0, C0, 6);
-       if (sd->sensor == SENSOR_ADCM1700)
+       switch (sd->sensor) {
+       case SENSOR_ADCM1700:
+       case SENSOR_GC0307:
                reg_w(gspca_dev, 0xca, CA_adcm1700, 4);
-       else
+               break;
+       case SENSOR_PO2030N:
+               reg_w(gspca_dev, 0xca, CA_po2030n, 4);
+               break;
+       default:
                reg_w(gspca_dev, 0xca, CA, 4);
+               break;
+       }
        switch (sd->sensor) {
        case SENSOR_ADCM1700:
        case SENSOR_OV7630:
@@ -2163,6 +2435,12 @@ static int sd_start(struct gspca_dev *gspca_dev)
        case SENSOR_OV7660:
                reg_w(gspca_dev, 0xce, CE_ov76xx, 4);
                break;
+       case SENSOR_GC0307:
+               reg_w(gspca_dev, 0xce, CE_gc0307, 4);
+               break;
+       case SENSOR_PO2030N:
+               reg_w(gspca_dev, 0xce, CE_po2030n, 4);
+               break;
        default:
                reg_w(gspca_dev, 0xce, CE, 4);
                                        /* ?? {0x1e, 0xdd, 0x2d, 0xe7} */
@@ -2200,6 +2478,9 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
 
        data = 0x0b;
        switch (sd->sensor) {
+       case SENSOR_GC0307:
+               data = 0x29;
+               break;
        case SENSOR_HV7131R:
                i2c_w8(gspca_dev, stophv7131);
                data = 0x2b;
@@ -2676,7 +2957,7 @@ static const __devinitdata struct usb_device_id device_table[] = {
 #endif
        {USB_DEVICE(0x0c45, 0x613c), BS(SN9C120, HV7131R)},
        {USB_DEVICE(0x0c45, 0x613e), BS(SN9C120, OV7630)},
-/*     {USB_DEVICE(0x0c45, 0x6142), BS(SN9C120, PO2030N)},      *sn9c120b*/
+       {USB_DEVICE(0x0c45, 0x6142), BS(SN9C120, PO2030N)},     /*sn9c120b*/
        {USB_DEVICE(0x0c45, 0x6143), BS(SN9C120, SP80708)},     /*sn9c120b*/
        {USB_DEVICE(0x0c45, 0x6148), BS(SN9C120, OM6802)},      /*sn9c120b*/
        {USB_DEVICE(0x0c45, 0x614a), BS(SN9C120, ADCM1700)},    /*sn9c120b*/