]> pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - drivers/media/video/gspca/sonixj.c
V4L/DVB (9712): gspca:Subdriver ov534 added.
[linux-2.6-omap-h63xx.git] / drivers / media / video / gspca / sonixj.c
index 53cb82d9e7c6a28909636595968ae335c9809698..df84bf9f227ff443d2b351a693c9ac79b5f61af4 100644 (file)
@@ -24,6 +24,8 @@
 #include "gspca.h"
 #include "jpeg.h"
 
+#define V4L2_CID_INFRARED (V4L2_CID_PRIVATE_BASE + 0)
+
 MODULE_AUTHOR("Michel Xhaard <mxhaard@users.sourceforge.net>");
 MODULE_DESCRIPTION("GSPCA/SONIX JPEG USB Camera Driver");
 MODULE_LICENSE("GPL");
@@ -40,6 +42,7 @@ struct sd {
        unsigned char colors;
        unsigned char autogain;
        __u8 vflip;                     /* ov7630 only */
+       __u8 infrared;                  /* mi0360 only */
 
        signed char ag_cnt;
 #define AG_CNT_START 13
@@ -73,6 +76,8 @@ static int sd_setautogain(struct gspca_dev *gspca_dev, __s32 val);
 static int sd_getautogain(struct gspca_dev *gspca_dev, __s32 *val);
 static int sd_setvflip(struct gspca_dev *gspca_dev, __s32 val);
 static int sd_getvflip(struct gspca_dev *gspca_dev, __s32 *val);
+static int sd_setinfrared(struct gspca_dev *gspca_dev, __s32 val);
+static int sd_getinfrared(struct gspca_dev *gspca_dev, __s32 *val);
 
 static struct ctrl sd_ctrls[] = {
        {
@@ -150,6 +155,22 @@ static struct ctrl sd_ctrls[] = {
            .set = sd_setvflip,
            .get = sd_getvflip,
        },
+/* mi0360 only */
+#define INFRARED_IDX 5
+       {
+           {
+               .id      = V4L2_CID_INFRARED,
+               .type    = V4L2_CTRL_TYPE_BOOLEAN,
+               .name    = "Infrared",
+               .minimum = 0,
+               .maximum = 1,
+               .step    = 1,
+#define INFRARED_DEF 0
+               .default_value = INFRARED_DEF,
+           },
+           .set = sd_setinfrared,
+           .get = sd_getinfrared,
+       },
 };
 
 static struct v4l2_pix_format vga_mode[] = {
@@ -231,13 +252,13 @@ static const __u8 sn_ov7630[] = {
 
 static const __u8 sn_ov7648[] = {
 /*     reg0    reg1    reg2    reg3    reg4    reg5    reg6    reg7 */
-       0x00,   0x21,   0x62,   0x00,   0x1a,   0x20,   0x20,   0x20,
+       0x00,   0x63,   0x40,   0x00,   0x1a,   0x20,   0x20,   0x20,
 /*     reg8    reg9    rega    regb    regc    regd    rege    regf */
-       0xa1,   0x6e,   0x18,   0x65,   0x00,   0x00,   0x00,   0x10,
+       0x81,   0x21,   0x00,   0x00,   0x00,   0x00,   0x00,   0x10,
 /*     reg10   reg11   reg12   reg13   reg14   reg15   reg16   reg17 */
-       0x03,   0x00,   0x00,   0x06,   0x06,   0x28,   0x1e,   0x82,
+       0x03,   0x00,   0x00,   0x01,   0x00,   0x28,   0x1e,   0x00,
 /*     reg18   reg19   reg1a   reg1b   reg1c   reg1d   reg1e   reg1f */
-       0x07,   0x00,   0x00,   0x00,   0x00,   0x00
+       0x0b,   0x00,   0x00,   0x00,   0x00,   0x00
 };
 
 static const __u8 sn_ov7660[]  = {
@@ -469,6 +490,53 @@ static const __u8 ov7630_sensor_init[][8] = {
 /*     {0xb1, 0x21, 0x01, 0x88, 0x70, 0x00, 0x00, 0x10}, */
        {}
 };
+
+static const __u8 ov7648_sensor_init[][8] = {
+       {0xa1, 0x21, 0x76, 0x00, 0x00, 0x00, 0x00, 0x10},
+       {0xa1, 0x21, 0x12, 0x80, 0x00, 0x00, 0x00, 0x10},       /* reset */
+       {0xa1, 0x21, 0x12, 0x00, 0x00, 0x00, 0x00, 0x10},
+       {0xd1, 0x21, 0x03, 0xa4, 0x30, 0x88, 0x00, 0x10},
+       {0xb1, 0x21, 0x11, 0x80, 0x08, 0x00, 0x00, 0x10},
+       {0xc1, 0x21, 0x13, 0xa0, 0x04, 0x84, 0x00, 0x10},
+       {0xd1, 0x21, 0x17, 0x1a, 0x02, 0xba, 0xf4, 0x10},
+       {0xa1, 0x21, 0x1b, 0x04, 0x00, 0x00, 0x00, 0x10},
+       {0xd1, 0x21, 0x1f, 0x41, 0xc0, 0x80, 0x80, 0x10},
+       {0xd1, 0x21, 0x23, 0xde, 0xa0, 0x80, 0x32, 0x10},
+       {0xd1, 0x21, 0x27, 0xfe, 0xa0, 0x00, 0x91, 0x10},
+       {0xd1, 0x21, 0x2b, 0x00, 0x88, 0x85, 0x80, 0x10},
+       {0xc1, 0x21, 0x2f, 0x9c, 0x00, 0xc4, 0x00, 0x10},
+       {0xd1, 0x21, 0x60, 0xa6, 0x60, 0x88, 0x12, 0x10},
+       {0xd1, 0x21, 0x64, 0x88, 0x00, 0x00, 0x94, 0x10},
+       {0xd1, 0x21, 0x68, 0x7a, 0x0c, 0x00, 0x00, 0x10},
+       {0xd1, 0x21, 0x6c, 0x11, 0x33, 0x22, 0x00, 0x10},
+       {0xd1, 0x21, 0x70, 0x11, 0x00, 0x10, 0x50, 0x10},
+       {0xd1, 0x21, 0x74, 0x20, 0x06, 0x00, 0xb5, 0x10},
+       {0xd1, 0x21, 0x78, 0x8a, 0x00, 0x00, 0x00, 0x10},
+       {0xb1, 0x21, 0x7c, 0x00, 0x43, 0x00, 0x00, 0x10},
+
+       {0xd1, 0x21, 0x21, 0x86, 0x00, 0xde, 0xa0, 0x10},
+/*     {0xd1, 0x21, 0x25, 0x80, 0x32, 0xfe, 0xa0, 0x10}, jfm done */
+/*     {0xd1, 0x21, 0x29, 0x00, 0x91, 0x00, 0x88, 0x10}, jfm done */
+       {0xb1, 0x21, 0x2d, 0x85, 0x00, 0x00, 0x00, 0x10},
+/*...*/
+/*     {0xa1, 0x21, 0x12, 0x08, 0x00, 0x00, 0x00, 0x10}, jfm done */
+/*     {0xa1, 0x21, 0x75, 0x06, 0x00, 0x00, 0x00, 0x10}, jfm done */
+       {0xa1, 0x21, 0x19, 0x02, 0x00, 0x00, 0x00, 0x10},
+       {0xa1, 0x21, 0x10, 0x32, 0x00, 0x00, 0x00, 0x10},
+/*     {0xa1, 0x21, 0x16, 0x00, 0x00, 0x00, 0x00, 0x10}, jfm done */
+/*     {0xa1, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10},  * GAIN - def */
+/*     {0xb1, 0x21, 0x01, 0x6c, 0x6c, 0x00, 0x00, 0x10},  * B R - def: 80 */
+/*...*/
+       {0xa1, 0x21, 0x11, 0x81, 0x00, 0x00, 0x00, 0x10}, /* CLKRC */
+/*     {0xa1, 0x21, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x10}, jfm done */
+/*     {0xa1, 0x21, 0x16, 0x00, 0x00, 0x00, 0x00, 0x10}, jfm done */
+/*     {0xa1, 0x21, 0x2a, 0x91, 0x00, 0x00, 0x00, 0x10}, jfm done */
+/*     {0xa1, 0x21, 0x2b, 0x00, 0x00, 0x00, 0x00, 0x10}, jfm done */
+/*     {0xb1, 0x21, 0x01, 0x64, 0x84, 0x00, 0x00, 0x10},  * B R - def: 80 */
+
+       {}
+};
+
 static const __u8 ov7660_sensor_init[][8] = {
        {0xa1, 0x21, 0x12, 0x80, 0x00, 0x00, 0x00, 0x10}, /* reset SCCB */
 /*             (delay 20ms) */
@@ -557,64 +625,6 @@ static const __u8 ov7660_sensor_init[][8] = {
        {0xa1, 0x21, 0x2b, 0xc3, 0x00, 0x00, 0x00, 0x10},
        {}
 };
-/*       reg 0x04        reg 0x07                 reg 0x10 */
-/* expo = (COM1 & 0x02) | ((AECHH & 0x2f) << 10) | (AECh << 2) */
-
-static const __u8 ov7648_sensor_init[][8] = {
-       {0xC1, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00},
-       {0xC1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00},
-       {0xC1, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00},
-       {0xA1, 0x6E, 0x3F, 0x20, 0x00, 0x00, 0x00, 0x10},
-       {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},
-       {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},
-       {0xD1, 0x6E, 0x2D, 0x14, 0x35, 0x61, 0x84, 0x10},
-       {0xD1, 0x6E, 0x31, 0xA2, 0xBD, 0xD8, 0xFF, 0x10},
-       {0xD1, 0x6E, 0x35, 0x06, 0x1E, 0x12, 0x02, 0x10},
-       {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},
-       {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},
- * This is currently setting a
- * blue tint, and some things more , i leave it here for future test if
- * somene is having problems with color on this sensor
-       {0xD1, 0x6E, 0x6B, 0x00, 0x00, 0x00, 0x00, 0x10},
-       {0xD1, 0x6E, 0x6F, 0x00, 0x00, 0x00, 0x00, 0x10},
-       {0xC1, 0x6E, 0x73, 0x10, 0x80, 0xEB, 0x00, 0x10},
-       {0xA1, 0x6E, 0x1E, 0x03, 0x00, 0x00, 0x00, 0x10},
-       {0xA1, 0x6E, 0x15, 0x01, 0x00, 0x00, 0x00, 0x10},
-       {0xC1, 0x6E, 0x16, 0x40, 0x40, 0x40, 0x00, 0x10},
-       {0xA1, 0x6E, 0x1D, 0x08, 0x00, 0x00, 0x00, 0x10},
-       {0xA1, 0x6E, 0x06, 0x02, 0x00, 0x00, 0x00, 0x10},
-       {0xA1, 0x6E, 0x07, 0xB5, 0x00, 0x00, 0x00, 0x10},
-       {0xA1, 0x6E, 0x18, 0x6B, 0x00, 0x00, 0x00, 0x10},
-       {0xA1, 0x6E, 0x1D, 0x08, 0x00, 0x00, 0x00, 0x10},
-       {0xA1, 0x6E, 0x06, 0x02, 0x00, 0x00, 0x00, 0x10},
-       {0xA1, 0x6E, 0x07, 0xB8, 0x00, 0x00, 0x00, 0x10},  */
-       {0xC1, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00},
-       {0xA1, 0x6E, 0x06, 0x03, 0x00, 0x00, 0x00, 0x10}, /* Bright... */
-       {0xA1, 0x6E, 0x07, 0x66, 0x00, 0x00, 0x00, 0x10}, /* B.. */
-       {0xC1, 0x6E, 0x1A, 0x03, 0x65, 0x90, 0x00, 0x10}, /* Bright/Witen....*/
-/*     {0xC1, 0x6E, 0x16, 0x45, 0x40, 0x60, 0x00, 0x10},  * Bright/Witene */
-       {}
-};
 
 static const __u8 qtable4[] = {
        0x06, 0x04, 0x04, 0x06, 0x04, 0x04, 0x06, 0x06, 0x06, 0x06, 0x08, 0x06,
@@ -827,17 +837,20 @@ static int configure_gpio(struct gspca_dev *gspca_dev,
                reg_w1(gspca_dev, 0x01, 0x40);
                break;
        case SENSOR_OV7648:
-               reg_w1(gspca_dev, 0x01, 0x43);
-               reg_w1(gspca_dev, 0x17, 0xae);
+               reg_w1(gspca_dev, 0x01, 0x63);
+               reg_w1(gspca_dev, 0x17, 0x20);
                reg_w1(gspca_dev, 0x01, 0x42);
                break;
 /*jfm: from win trace */
        case SENSOR_OV7660:
-               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;
+               if (sd->bridge == BRIDGE_SN9C120) {
+                       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;
+               }
+               /* fall thru */
        default:
                reg_w1(gspca_dev, 0x01, 0x43);
                reg_w1(gspca_dev, 0x17, 0x61);
@@ -922,6 +935,13 @@ static void ov7648_InitSensor(struct gspca_dev *gspca_dev)
 {
        int i = 0;
 
+       i2c_w8(gspca_dev, ov7648_sensor_init[i]);
+       i++;
+/* win: dble reset */
+       i2c_w8(gspca_dev, ov7648_sensor_init[i]);       /* reset */
+       i++;
+       msleep(20);
+/* win: i2c reg read 00..7f */
        while (ov7648_sensor_init[i][0]) {
                i2c_w8(gspca_dev, ov7648_sensor_init[i]);
                i++;
@@ -963,6 +983,8 @@ static int sd_config(struct gspca_dev *gspca_dev,
        sd->colors = COLOR_DEF;
        sd->autogain = AUTOGAIN_DEF;
        sd->ag_cnt = -1;
+       sd->vflip = VFLIP_DEF;
+       sd->infrared = INFRARED_DEF;
 
        switch (sd->sensor) {
        case SENSOR_OV7630:
@@ -973,7 +995,8 @@ static int sd_config(struct gspca_dev *gspca_dev,
        }
        if (sd->sensor != SENSOR_OV7630)
                gspca_dev->ctrl_dis |= (1 << VFLIP_IDX);
-
+       if (sd->sensor != SENSOR_MI0360)
+               gspca_dev->ctrl_dis |= (1 << INFRARED_IDX);
        return 0;
 }
 
@@ -1195,12 +1218,18 @@ static void setautogain(struct gspca_dev *gspca_dev)
 
 static void setvflip(struct sd *sd)
 {
-       if (sd->sensor != SENSOR_OV7630)
-               return;
        i2c_w1(&sd->gspca_dev, 0x75,                    /* COMN */
                sd->vflip ? 0x82 : 0x02);
 }
 
+static void setinfrared(struct sd *sd)
+{
+/*fixme: different sequence for StarCam Clip and StarCam 370i */
+/* Clip */
+       i2c_w1(&sd->gspca_dev, 0x02,                    /* gpio */
+               sd->infrared ? 0x66 : 0x64);
+}
+
 /* -- start the camera -- */
 static int sd_start(struct gspca_dev *gspca_dev)
 {
@@ -1235,17 +1264,21 @@ static int sd_start(struct gspca_dev *gspca_dev)
                reg17 = 0xe2;
                break;
        case SENSOR_OV7648:
-               reg17 = 0xae;
+               reg17 = 0x20;
                break;
 /*jfm: from win trace */
        case SENSOR_OV7660:
-               reg17 = 0xa0;
-               break;
+               if (sd->bridge == BRIDGE_SN9C120) {
+                       reg17 = 0xa0;
+                       break;
+               }
+               /* fall thru */
        default:
                reg17 = 0x60;
                break;
        }
        reg_w1(gspca_dev, 0x17, reg17);
+/* set reg1 was here */
        reg_w1(gspca_dev, 0x05, sn9c1xx[5]);
        reg_w1(gspca_dev, 0x07, sn9c1xx[7]);
        reg_w1(gspca_dev, 0x06, sn9c1xx[6]);
@@ -1254,9 +1287,16 @@ static int sd_start(struct gspca_dev *gspca_dev)
        for (i = 0; i < 8; i++)
                reg_w(gspca_dev, 0x84, reg84, sizeof reg84);
        switch (sd->sensor) {
-       case SENSOR_OV7660:
-               reg_w1(gspca_dev, 0x9a, 0x05);
+       case SENSOR_OV7648:
+               reg_w1(gspca_dev, 0x9a, 0x0a);
+               reg_w1(gspca_dev, 0x99, 0x60);
                break;
+       case SENSOR_OV7660:
+               if (sd->bridge == BRIDGE_SN9C120) {
+                       reg_w1(gspca_dev, 0x9a, 0x05);
+                       break;
+               }
+               /* fall thru */
        default:
                reg_w1(gspca_dev, 0x9a, 0x08);
                reg_w1(gspca_dev, 0x99, 0x59);
@@ -1265,10 +1305,10 @@ static int sd_start(struct gspca_dev *gspca_dev)
 
        mode = gspca_dev->cam.cam_mode[(int) gspca_dev->curr_mode].priv;
        if (mode)
-               reg1 = 0x46;    /* 320 clk 48Mhz */
+               reg1 = 0x46;    /* 320x240: clk 48Mhz, video trf enable */
        else
-               reg1 = 0x06;    /* 640 clk 24Mz */
-       reg17 = 0x61;
+               reg1 = 0x06;    /* 640x480: clk 24Mhz, video trf enable */
+       reg17 = 0x61;           /* 0x:20: enable sensor clock */
        switch (sd->sensor) {
        case SENSOR_HV7131R:
                hv7131R_InitSensor(gspca_dev);
@@ -1298,8 +1338,8 @@ static int sd_start(struct gspca_dev *gspca_dev)
                break;
        case SENSOR_OV7648:
                ov7648_InitSensor(gspca_dev);
-               reg17 = 0xa2;
-               reg1 = 0x44;
+               reg17 = 0x21;
+/*             reg1 = 0x42;             * 42 - 46? */
 /*             if (mode)
                        ;                * 320x2...
                else
@@ -1312,9 +1352,15 @@ static int sd_start(struct gspca_dev *gspca_dev)
 /*                     reg17 = 0x21;    * 320 */
 /*                     reg1 = 0x44; */
 /*                     reg1 = 0x46;    (done) */
-               } else {
-                       reg17 = 0xa2;   /* 640 */
-                       reg1 = 0x44;
+               } else {                        /* 640 */
+                       if (sd->bridge == BRIDGE_SN9C120) {
+                               reg17 = 0xa2;
+                               reg1 = 0x44;    /* 48 Mhz, video trf eneble */
+                       } else {
+                               reg17 = 0x22;
+                               reg1 = 0x06;    /* 24 Mhz, video trf eneble
+                                                * inverse power down */
+                       }
                }
                break;
        }
@@ -1342,9 +1388,12 @@ static int sd_start(struct gspca_dev *gspca_dev)
        reg_w1(gspca_dev, 0x18, reg18);
 
        reg_w1(gspca_dev, 0x17, reg17);
+       reg_w1(gspca_dev, 0x01, reg1);
        switch (sd->sensor) {
-       case SENSOR_HV7131R:
        case SENSOR_MI0360:
+               setinfrared(sd);
+               /* fall thru */
+       case SENSOR_HV7131R:
        case SENSOR_MO4000:
        case SENSOR_OM6802:
                setbrightness(gspca_dev);
@@ -1358,7 +1407,6 @@ static int sd_start(struct gspca_dev *gspca_dev)
                break;
        }
        setautogain(gspca_dev);
-       reg_w1(gspca_dev, 0x01, reg1);
        return 0;
 }
 
@@ -1369,6 +1417,8 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
                { 0xa1, 0x11, 0x02, 0x09, 0x00, 0x00, 0x00, 0x10 };
        static const __u8 stopmi0360[] =
                { 0xb1, 0x5d, 0x07, 0x00, 0x00, 0x00, 0x00, 0x10 };
+       static const __u8 stopov7648[] =
+               { 0xa1, 0x21, 0x76, 0x20, 0x00, 0x00, 0x00, 0x10 };
        __u8 data;
        const __u8 *sn9c1xx;
 
@@ -1382,8 +1432,10 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
                i2c_w8(gspca_dev, stopmi0360);
                data = 0x29;
                break;
-       case SENSOR_OV7630:
        case SENSOR_OV7648:
+               i2c_w8(gspca_dev, stopov7648);
+               /* fall thru */
+       case SENSOR_OV7630:
                data = 0x29;
                break;
        default:
@@ -1598,6 +1650,24 @@ static int sd_getvflip(struct gspca_dev *gspca_dev, __s32 *val)
        return 0;
 }
 
+static int sd_setinfrared(struct gspca_dev *gspca_dev, __s32 val)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+
+       sd->infrared = val;
+       if (gspca_dev->streaming)
+               setinfrared(sd);
+       return 0;
+}
+
+static int sd_getinfrared(struct gspca_dev *gspca_dev, __s32 *val)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+
+       *val = sd->infrared;
+       return 0;
+}
+
 /* sub-driver description */
 static const struct sd_desc sd_desc = {
        .name = MODULE_NAME,
@@ -1620,11 +1690,13 @@ static const __devinitdata struct usb_device_id device_table[] = {
 #if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE
        {USB_DEVICE(0x0458, 0x7025), BSI(SN9C120, MI0360, 0x5d)},
        {USB_DEVICE(0x0458, 0x702e), BSI(SN9C120, OV7660, 0x21)},
+#endif
        {USB_DEVICE(0x045e, 0x00f5), BSI(SN9C105, OV7660, 0x21)},
        {USB_DEVICE(0x045e, 0x00f7), BSI(SN9C105, OV7660, 0x21)},
+#if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE
        {USB_DEVICE(0x0471, 0x0327), BSI(SN9C105, MI0360, 0x5d)},
-       {USB_DEVICE(0x0471, 0x0328), BSI(SN9C105, MI0360, 0x5d)},
 #endif
+       {USB_DEVICE(0x0471, 0x0328), BSI(SN9C105, MI0360, 0x5d)},
        {USB_DEVICE(0x0471, 0x0330), BSI(SN9C105, MI0360, 0x5d)},
        {USB_DEVICE(0x0c45, 0x6040), BSI(SN9C102P, HV7131R, 0x11)},
 /* bw600.inf:
@@ -1649,7 +1721,7 @@ static const __devinitdata struct usb_device_id device_table[] = {
 /*     {USB_DEVICE(0x0c45, 0x6123), BSI(SN9C110, SanyoCCD, 0x??)}, */
        {USB_DEVICE(0x0c45, 0x6128), BSI(SN9C110, OM6802, 0x21)}, /*sn9c325?*/
 /*bw600.inf:*/
-       {USB_DEVICE(0x0c45, 0x612a), BSI(SN9C110, OV7648, 0x21)}, /*sn9c325?*/
+       {USB_DEVICE(0x0c45, 0x612a), BSI(SN9C120, OV7648, 0x21)}, /*sn9c110?*/
        {USB_DEVICE(0x0c45, 0x612c), BSI(SN9C110, MO4000, 0x21)},
        {USB_DEVICE(0x0c45, 0x612e), BSI(SN9C110, OV7630, 0x21)},
 /*     {USB_DEVICE(0x0c45, 0x612f), BSI(SN9C110, ICM105C, 0x??)}, */
@@ -1657,8 +1729,8 @@ static const __devinitdata struct usb_device_id device_table[] = {
        {USB_DEVICE(0x0c45, 0x6130), BSI(SN9C120, MI0360, 0x5d)},
 #endif
        {USB_DEVICE(0x0c45, 0x6138), BSI(SN9C120, MO4000, 0x21)},
+       {USB_DEVICE(0x0c45, 0x613a), BSI(SN9C120, OV7648, 0x21)},
 #if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE
-/*     {USB_DEVICE(0x0c45, 0x613a), BSI(SN9C120, OV7648, 0x??)}, */
        {USB_DEVICE(0x0c45, 0x613b), BSI(SN9C120, OV7660, 0x21)},
        {USB_DEVICE(0x0c45, 0x613c), BSI(SN9C120, HV7131R, 0x11)},
 /*     {USB_DEVICE(0x0c45, 0x613e), BSI(SN9C120, OV7630, 0x??)}, */