V4L/DVB (11106): gspca - ov534: New sensor ov965x and re-enable the webcam 06f8:3003
authorJean-Francois Moine <moinejf@free.fr>
Thu, 19 Mar 2009 09:15:21 +0000 (06:15 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 30 Mar 2009 15:43:29 +0000 (12:43 -0300)
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/gspca/ov534.c

index 647c448f492fa79ac3d55f80ce8011507f260b65..19e0bc60de14aecf95708b7d6c922b49e063ce3a 100644 (file)
@@ -1,7 +1,8 @@
 /*
- * ov534/ov772x gspca driver
+ * ov534 gspca driver
  * Copyright (C) 2008 Antonio Ospite <ospite@studenti.unina.it>
  * Copyright (C) 2008 Jim Paris <jim@jtan.com>
+ * Copyright (C) 2009 Jean-Francois Moine http://moinejf.free.fr
  *
  * Based on a prototype written by Mark Ferrell <majortrips@gmail.com>
  * USB protocol reverse engineered by Jim Paris <jim@jtan.com>
@@ -26,7 +27,7 @@
 
 #include "gspca.h"
 
-#define OV534_REG_ADDRESS      0xf1    /* ? */
+#define OV534_REG_ADDRESS      0xf1    /* sensor address */
 #define OV534_REG_SUBADDR      0xf2
 #define OV534_REG_WRITE                0xf3
 #define OV534_REG_READ         0xf4
@@ -49,6 +50,10 @@ struct sd {
        __u32 last_pts;
        u16 last_fid;
        u8 frame_rate;
+
+       u8 sensor;
+#define SENSOR_OV772X 0
+#define SENSOR_OV965X 1
 };
 
 /* V4L2 controls supported by the driver */
@@ -63,114 +68,7 @@ static const struct v4l2_pix_format vga_mode[] = {
         .priv = 0},
 };
 
-static void ov534_reg_write(struct gspca_dev *gspca_dev, u16 reg, u8 val)
-{
-       struct usb_device *udev = gspca_dev->dev;
-       int ret;
-
-       PDEBUG(D_USBO, "reg=0x%04x, val=0%02x", reg, val);
-       gspca_dev->usb_buf[0] = val;
-       ret = usb_control_msg(udev,
-                             usb_sndctrlpipe(udev, 0),
-                             0x1,
-                             USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
-                             0x0, reg, gspca_dev->usb_buf, 1, CTRL_TIMEOUT);
-       if (ret < 0)
-               PDEBUG(D_ERR, "write failed");
-}
-
-static u8 ov534_reg_read(struct gspca_dev *gspca_dev, u16 reg)
-{
-       struct usb_device *udev = gspca_dev->dev;
-       int ret;
-
-       ret = usb_control_msg(udev,
-                             usb_rcvctrlpipe(udev, 0),
-                             0x1,
-                             USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
-                             0x0, reg, gspca_dev->usb_buf, 1, CTRL_TIMEOUT);
-       PDEBUG(D_USBI, "reg=0x%04x, data=0x%02x", reg, gspca_dev->usb_buf[0]);
-       if (ret < 0)
-               PDEBUG(D_ERR, "read failed");
-       return gspca_dev->usb_buf[0];
-}
-
-/* Two bits control LED: 0x21 bit 7 and 0x23 bit 7.
- * (direction and output)? */
-static void ov534_set_led(struct gspca_dev *gspca_dev, int status)
-{
-       u8 data;
-
-       PDEBUG(D_CONF, "led status: %d", status);
-
-       data = ov534_reg_read(gspca_dev, 0x21);
-       data |= 0x80;
-       ov534_reg_write(gspca_dev, 0x21, data);
-
-       data = ov534_reg_read(gspca_dev, 0x23);
-       if (status)
-               data |= 0x80;
-       else
-               data &= ~(0x80);
-
-       ov534_reg_write(gspca_dev, 0x23, data);
-}
-
-static int sccb_check_status(struct gspca_dev *gspca_dev)
-{
-       u8 data;
-       int i;
-
-       for (i = 0; i < 5; i++) {
-               data = ov534_reg_read(gspca_dev, OV534_REG_STATUS);
-
-               switch (data) {
-               case 0x00:
-                       return 1;
-               case 0x04:
-                       return 0;
-               case 0x03:
-                       break;
-               default:
-                       PDEBUG(D_ERR, "sccb status 0x%02x, attempt %d/5",
-                              data, i + 1);
-               }
-       }
-       return 0;
-}
-
-static void sccb_reg_write(struct gspca_dev *gspca_dev, u16 reg, u8 val)
-{
-       PDEBUG(D_USBO, "reg: 0x%04x, val: 0x%02x", reg, val);
-       ov534_reg_write(gspca_dev, OV534_REG_SUBADDR, reg);
-       ov534_reg_write(gspca_dev, OV534_REG_WRITE, val);
-       ov534_reg_write(gspca_dev, OV534_REG_OPERATION, OV534_OP_WRITE_3);
-
-       if (!sccb_check_status(gspca_dev))
-               PDEBUG(D_ERR, "sccb_reg_write failed");
-}
-
-#ifdef GSPCA_DEBUG
-static u8 sccb_reg_read(struct gspca_dev *gspca_dev, u16 reg)
-{
-       ov534_reg_write(gspca_dev, OV534_REG_SUBADDR, reg);
-       ov534_reg_write(gspca_dev, OV534_REG_OPERATION, OV534_OP_WRITE_2);
-       if (!sccb_check_status(gspca_dev))
-               PDEBUG(D_ERR, "sccb_reg_read failed 1");
-
-       ov534_reg_write(gspca_dev, OV534_REG_OPERATION, OV534_OP_READ_2);
-       if (!sccb_check_status(gspca_dev))
-               PDEBUG(D_ERR, "sccb_reg_read failed 2");
-
-       return ov534_reg_read(gspca_dev, OV534_REG_READ);
-}
-#endif
-
-static const __u8 ov534_reg_initdata[][2] = {
-       { 0xe7, 0x3a },
-
-       { OV534_REG_ADDRESS, 0x42 }, /* select OV772x sensor */
-
+static const u8 bridge_init_ov722x[][2] = {
        { 0xc2, 0x0c },
        { 0x88, 0xf8 },
        { 0xc3, 0x69 },
@@ -228,7 +126,7 @@ static const __u8 ov534_reg_initdata[][2] = {
        { 0xc2, 0x0c },
 };
 
-static const __u8 ov772x_reg_initdata[][2] = {
+static const u8 sensor_init_ov722x[][2] = {
        { 0x12, 0x80 },
        { 0x11, 0x01 },
 
@@ -311,6 +209,456 @@ static const __u8 ov772x_reg_initdata[][2] = {
        { 0x0c, 0xd0 }
 };
 
+static const u8 bridge_init_ov965x[][2] = {
+       {0x88, 0xf8},
+       {0x89, 0xff},
+       {0x76, 0x03},
+       {0x92, 0x03},
+       {0x95, 0x10},
+       {0xe2, 0x00},
+       {0xe7, 0x3e},
+       {0x8d, 0x1c},
+       {0x8e, 0x00},
+       {0x8f, 0x00},
+       {0x1f, 0x00},
+       {0xc3, 0xf9},
+       {0x89, 0xff},
+       {0x88, 0xf8},
+       {0x76, 0x03},
+       {0x92, 0x01},
+       {0x93, 0x18},
+       {0x1c, 0x0a},
+       {0x1d, 0x48},
+       {0xc0, 0x50},
+       {0xc1, 0x3c},
+       {0x34, 0x05},
+       {0xc2, 0x0c},
+       {0xc3, 0xf9},
+       {0x34, 0x05},
+       {0xe7, 0x2e},
+       {0x31, 0xf9},
+       {0x35, 0x02},
+       {0xd9, 0x10},
+       {0x25, 0x42},
+       {0x94, 0x11},
+};
+
+static const u8 sensor_init_ov965x[][2] = {
+       {0x12, 0x80},   /* com7 - reset */
+       {0x00, 0x00},   /* gain */
+       {0x01, 0x80},   /* blue */
+       {0x02, 0x80},   /* red */
+       {0x03, 0x1b},   /* vref */
+       {0x04, 0x03},   /* com1 - exposure low bits */
+       {0x0b, 0x57},   /* ver */
+       {0x0e, 0x61},   /* com5 */
+       {0x0f, 0x42},   /* com6 */
+       {0x11, 0x00},   /* clkrc */
+       {0x12, 0x02},   /* com7 */
+       {0x13, 0xe7},   /* com8 - everything (AGC, AWB and AEC) */
+       {0x14, 0x28},   /* com9 */
+       {0x16, 0x24},   /* rsvd16 */
+       {0x17, 0x1d},   /* hstart*/
+       {0x18, 0xbd},   /* hstop */
+       {0x19, 0x01},   /* vstrt */
+       {0x1a, 0x81},   /* vstop*/
+       {0x1e, 0x04},   /* mvfp */
+       {0x24, 0x3c},   /* aew */
+       {0x25, 0x36},   /* aeb */
+       {0x26, 0x71},   /* vpt */
+       {0x27, 0x08},   /* bbias */
+       {0x28, 0x08},   /* gbbias */
+       {0x29, 0x15},   /* gr com */
+       {0x2a, 0x00},
+       {0x2b, 0x00},
+       {0x2c, 0x08},   /* rbias */
+       {0x32, 0xff},   /* href */
+       {0x33, 0x00},   /* chlf */
+       {0x34, 0x3f},   /* arblm */
+       {0x35, 0x00},   /* rsvd35 */
+       {0x36, 0xf8},   /* rsvd36 */
+       {0x38, 0x72},   /* acom38 */
+       {0x39, 0x57},   /* ofon */
+       {0x3a, 0x80},   /* tslb */
+       {0x3b, 0xc4},
+       {0x3d, 0x99},   /* com13 */
+       {0x3f, 0xc1},
+       {0x40, 0xc0},   /* com15 */
+       {0x41, 0x40},   /* com16 */
+       {0x42, 0xc0},
+       {0x43, 0x0a},
+       {0x44, 0xf0},
+       {0x45, 0x46},
+       {0x46, 0x62},
+       {0x47, 0x2a},
+       {0x48, 0x3c},
+       {0x4a, 0xfc},
+       {0x4b, 0xfc},
+       {0x4c, 0x7f},
+       {0x4d, 0x7f},
+       {0x4e, 0x7f},
+       {0x4f, 0x98},
+       {0x50, 0x98},
+       {0x51, 0x00},
+       {0x52, 0x28},
+       {0x53, 0x70},
+       {0x54, 0x98},
+       {0x58, 0x1a},
+       {0x59, 0x85},
+       {0x5a, 0xa9},
+       {0x5b, 0x64},
+       {0x5c, 0x84},
+       {0x5d, 0x53},
+       {0x5e, 0x0e},
+       {0x5f, 0xf0},
+       {0x60, 0xf0},
+       {0x61, 0xf0},
+       {0x62, 0x00},   /* lcc1 */
+       {0x63, 0x00},   /* lcc2 */
+       {0x64, 0x02},   /* lcc3 */
+       {0x65, 0x16},   /* lcc4 */
+       {0x66, 0x01},   /* lcc5 */
+       {0x69, 0x02},   /* hv */
+       {0x6b, 0x5a},   /* dbvl */
+       {0x6c, 0x04},
+       {0x6d, 0x55},
+       {0x6e, 0x00},
+       {0x6f, 0x9d},
+       {0x70, 0x21},
+       {0x71, 0x78},
+       {0x72, 0x00},
+       {0x73, 0x01},
+       {0x74, 0x3a},
+       {0x75, 0x35},
+       {0x76, 0x01},
+       {0x77, 0x02},
+       {0x7a, 0x12},
+       {0x7b, 0x08},
+       {0x7c, 0x16},
+       {0x7d, 0x30},
+       {0x7e, 0x5e},
+       {0x7f, 0x72},
+       {0x80, 0x82},
+       {0x81, 0x8e},
+       {0x82, 0x9a},
+       {0x83, 0xa4},
+       {0x84, 0xac},
+       {0x85, 0xb8},
+       {0x86, 0xc3},
+       {0x87, 0xd6},
+       {0x88, 0xe6},
+       {0x89, 0xf2},
+       {0x8a, 0x03},
+       {0x8c, 0x89},
+       {0x14, 0x28},   /* com9 */
+       {0x90, 0x7d},
+       {0x91, 0x7b},
+       {0x9d, 0x03},
+       {0x9e, 0x04},
+       {0x9f, 0x7a},
+       {0xa0, 0x79},
+       {0xa1, 0x40},   /* aechm */
+       {0xa4, 0x50},
+       {0xa5, 0x68},   /* com26 */
+       {0xa6, 0x4a},
+       {0xa8, 0xc1},   /* acoma8 */
+       {0xa9, 0xef},   /* acoma9 */
+       {0xaa, 0x92},
+       {0xab, 0x04},
+       {0xac, 0x80},
+       {0xad, 0x80},
+       {0xae, 0x80},
+       {0xaf, 0x80},
+       {0xb2, 0xf2},
+       {0xb3, 0x20},
+       {0xb4, 0x20},
+       {0xb5, 0x00},
+       {0xb6, 0xaf},
+       {0xbb, 0xae},
+       {0xbc, 0x7f},
+       {0xdb, 0x7f},
+       {0xbe, 0x7f},
+       {0xbf, 0x7f},
+       {0xc0, 0xe2},
+       {0xc1, 0xc0},
+       {0xc2, 0x01},
+       {0xc3, 0x4e},
+       {0xc6, 0x85},
+       {0xc7, 0x80},
+       {0xc9, 0xe0},
+       {0xca, 0xe8},
+       {0xcb, 0xf0},
+       {0xcc, 0xd8},
+       {0xcd, 0xf1},
+       {0x4f, 0x98},
+       {0x50, 0x98},
+       {0x51, 0x00},
+       {0x52, 0x28},
+       {0x53, 0x70},
+       {0x54, 0x98},
+       {0x58, 0x1a},
+       {0xff, 0x41},   /* read 41, write ff 00 */
+       {0x41, 0x40},   /* com16 */
+       {0xc5, 0x03},
+       {0x6a, 0x02},
+
+       {0x12, 0x62},   /* com7 - VGA + CIF */
+       {0x36, 0xfa},   /* rsvd36 */
+       {0x69, 0x0a},   /* hv */
+       {0x8c, 0x89},   /* com22 */
+       {0x14, 0x28},   /* com9 */
+       {0x3e, 0x0c},
+       {0x41, 0x40},   /* com16 */
+       {0x72, 0x00},
+       {0x73, 0x00},
+       {0x74, 0x3a},
+       {0x75, 0x35},
+       {0x76, 0x01},
+       {0xc7, 0x80},
+       {0x03, 0x12},   /* vref */
+       {0x17, 0x16},   /* hstart */
+       {0x18, 0x02},   /* hstop */
+       {0x19, 0x01},   /* vstrt */
+       {0x1a, 0x3d},   /* vstop */
+       {0x32, 0xff},   /* href */
+       {0xc0, 0xaa},
+};
+
+static const u8 bridge_init_ov965x_2[][2] = {
+       {0x94, 0xaa},
+       {0xf1, 0x60},
+       {0xe5, 0x04},
+       {0xc0, 0x50},
+       {0xc1, 0x3c},
+       {0x8c, 0x00},
+       {0x8d, 0x1c},
+       {0x34, 0x05},
+
+       {0xc2, 0x0c},
+       {0xc3, 0xf9},
+       {0xda, 0x01},
+       {0x50, 0x00},
+       {0x51, 0xa0},
+       {0x52, 0x3c},
+       {0x53, 0x00},
+       {0x54, 0x00},
+       {0x55, 0x00},
+       {0x57, 0x00},
+       {0x5c, 0x00},
+       {0x5a, 0xa0},
+       {0x5b, 0x78},
+       {0x35, 0x02},
+       {0xd9, 0x10},
+       {0x94, 0x11},
+};
+
+static const u8 sensor_init_ov965x_2[][2] = {
+       {0x3b, 0xc4},
+       {0x1e, 0x04},   /* mvfp */
+       {0x13, 0xe0},   /* com8 */
+       {0x00, 0x00},   /* gain */
+       {0x13, 0xe7},   /* com8 - everything (AGC, AWB and AEC) */
+       {0x11, 0x03},   /* clkrc */
+       {0x6b, 0x5a},   /* dblv */
+       {0x6a, 0x05},
+       {0xc5, 0x07},
+       {0xa2, 0x4b},
+       {0xa3, 0x3e},
+       {0x2d, 0x00},
+       {0xff, 0x42},   /* read 42, write ff 00 */
+       {0x42, 0xc0},
+       {0x2d, 0x00},
+       {0xff, 0x42},   /* read 42, write ff 00 */
+       {0x42, 0xc1},
+       {0x3f, 0x01},
+       {0xff, 0x42},   /* read 42, write ff 00 */
+       {0x42, 0xc1},
+       {0x4f, 0x98},
+       {0x50, 0x98},
+       {0x51, 0x00},
+       {0x52, 0x28},
+       {0x53, 0x70},
+       {0x54, 0x98},
+       {0x58, 0x1a},
+       {0xff, 0x41},   /* read 41, write ff 00 */
+       {0x41, 0x40},   /* com16 */
+       {0x56, 0x40},
+       {0x55, 0x8f},
+       {0x10, 0x25},   /* aech - exposure high bits */
+       {0xff, 0x13},   /* read 13, write ff 00 */
+       {0x13, 0xe7},   /* com8 - everything (AGC, AWB and AEC) */
+};
+
+static const u8 bridge_start_ov965x[][2] = {
+       {0xc2, 0x4c},
+       {0xc3, 0xf9},
+       {0x50, 0x00},
+       {0x51, 0xa0},
+       {0x52, 0x78},
+       {0x53, 0x00},
+       {0x54, 0x00},
+       {0x55, 0x00},
+       {0x57, 0x00},
+       {0x5c, 0x00},
+       {0x5a, 0x28},
+       {0x5b, 0x1e},
+       {0x35, 0x00},
+       {0xd9, 0x21},
+       {0x94, 0x11},
+};
+
+static const u8 sensor_start_ov965x[][2] = {
+       {0x3b, 0xe4},
+       {0x1e, 0x04},   /* mvfp */
+       {0x13, 0xe0},   /* com8 */
+       {0x00, 0x00},
+       {0x13, 0xe7},   /* com8 - everything (AGC, AWB and AEC) */
+       {0x11, 0x01},   /* clkrc */
+       {0x6b, 0x5a},   /* dblv */
+       {0x6a, 0x02},
+       {0xc5, 0x03},
+       {0xa2, 0x96},
+       {0xa3, 0x7d},
+       {0xff, 0x13},   /* read 13, write ff 00 */
+       {0x13, 0xe7},
+       {0x3a, 0x80},
+       {0xff, 0x42},   /* read 42, write ff 00 */
+       {0x42, 0xc1},
+};
+
+
+static void ov534_reg_write(struct gspca_dev *gspca_dev, u16 reg, u8 val)
+{
+       struct usb_device *udev = gspca_dev->dev;
+       int ret;
+
+       PDEBUG(D_USBO, "reg=0x%04x, val=0%02x", reg, val);
+       gspca_dev->usb_buf[0] = val;
+       ret = usb_control_msg(udev,
+                             usb_sndctrlpipe(udev, 0),
+                             0x01,
+                             USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+                             0x00, reg, gspca_dev->usb_buf, 1, CTRL_TIMEOUT);
+       if (ret < 0)
+               PDEBUG(D_ERR, "write failed");
+}
+
+static u8 ov534_reg_read(struct gspca_dev *gspca_dev, u16 reg)
+{
+       struct usb_device *udev = gspca_dev->dev;
+       int ret;
+
+       ret = usb_control_msg(udev,
+                             usb_rcvctrlpipe(udev, 0),
+                             0x01,
+                             USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+                             0x00, reg, gspca_dev->usb_buf, 1, CTRL_TIMEOUT);
+       PDEBUG(D_USBI, "reg=0x%04x, data=0x%02x", reg, gspca_dev->usb_buf[0]);
+       if (ret < 0)
+               PDEBUG(D_ERR, "read failed");
+       return gspca_dev->usb_buf[0];
+}
+
+/* Two bits control LED: 0x21 bit 7 and 0x23 bit 7.
+ * (direction and output)? */
+static void ov534_set_led(struct gspca_dev *gspca_dev, int status)
+{
+       u8 data;
+
+       PDEBUG(D_CONF, "led status: %d", status);
+
+       data = ov534_reg_read(gspca_dev, 0x21);
+       data |= 0x80;
+       ov534_reg_write(gspca_dev, 0x21, data);
+
+       data = ov534_reg_read(gspca_dev, 0x23);
+       if (status)
+               data |= 0x80;
+       else
+               data &= ~0x80;
+
+       ov534_reg_write(gspca_dev, 0x23, data);
+
+       if (!status) {
+               data = ov534_reg_read(gspca_dev, 0x21);
+               data &= ~0x80;
+               ov534_reg_write(gspca_dev, 0x21, data);
+       }
+}
+
+static int sccb_check_status(struct gspca_dev *gspca_dev)
+{
+       u8 data;
+       int i;
+
+       for (i = 0; i < 5; i++) {
+               data = ov534_reg_read(gspca_dev, OV534_REG_STATUS);
+
+               switch (data) {
+               case 0x00:
+                       return 1;
+               case 0x04:
+                       return 0;
+               case 0x03:
+                       break;
+               default:
+                       PDEBUG(D_ERR, "sccb status 0x%02x, attempt %d/5",
+                              data, i + 1);
+               }
+       }
+       return 0;
+}
+
+static void sccb_reg_write(struct gspca_dev *gspca_dev, u8 reg, u8 val)
+{
+       PDEBUG(D_USBO, "reg: 0x%02x, val: 0x%02x", reg, val);
+       ov534_reg_write(gspca_dev, OV534_REG_SUBADDR, reg);
+       ov534_reg_write(gspca_dev, OV534_REG_WRITE, val);
+       ov534_reg_write(gspca_dev, OV534_REG_OPERATION, OV534_OP_WRITE_3);
+
+       if (!sccb_check_status(gspca_dev))
+               PDEBUG(D_ERR, "sccb_reg_write failed");
+}
+
+static u8 sccb_reg_read(struct gspca_dev *gspca_dev, u16 reg)
+{
+       ov534_reg_write(gspca_dev, OV534_REG_SUBADDR, reg);
+       ov534_reg_write(gspca_dev, OV534_REG_OPERATION, OV534_OP_WRITE_2);
+       if (!sccb_check_status(gspca_dev))
+               PDEBUG(D_ERR, "sccb_reg_read failed 1");
+
+       ov534_reg_write(gspca_dev, OV534_REG_OPERATION, OV534_OP_READ_2);
+       if (!sccb_check_status(gspca_dev))
+               PDEBUG(D_ERR, "sccb_reg_read failed 2");
+
+       return ov534_reg_read(gspca_dev, OV534_REG_READ);
+}
+
+/* output a bridge sequence (reg - val) */
+static void reg_w_array(struct gspca_dev *gspca_dev,
+                       const u8 (*data)[2], int len)
+{
+       while (--len >= 0) {
+               ov534_reg_write(gspca_dev, (*data)[0], (*data)[1]);
+               data++;
+       }
+}
+
+/* output a sensor sequence (reg - val) */
+static void sccb_w_array(struct gspca_dev *gspca_dev,
+                       const u8 (*data)[2], int len)
+{
+       while (--len >= 0) {
+               if ((*data)[0] != 0xff) {
+                       sccb_reg_write(gspca_dev, (*data)[0], (*data)[1]);
+               } else {
+                       sccb_reg_read(gspca_dev, (*data)[1]);
+                       sccb_reg_write(gspca_dev, 0xff, 0x00);
+               }
+               data++;
+       }
+}
+
 /* set framerate */
 static void ov534_set_frame_rate(struct gspca_dev *gspca_dev)
 {
@@ -346,37 +694,15 @@ static void ov534_set_frame_rate(struct gspca_dev *gspca_dev)
        PDEBUG(D_PROBE, "frame_rate: %d", fr);
 }
 
-/* setup method */
-static void ov534_setup(struct gspca_dev *gspca_dev)
-{
-       int i;
-
-       /* Initialize bridge chip */
-       for (i = 0; i < ARRAY_SIZE(ov534_reg_initdata); i++)
-               ov534_reg_write(gspca_dev, ov534_reg_initdata[i][0],
-                               ov534_reg_initdata[i][1]);
-
-       PDEBUG(D_PROBE, "sensor is ov%02x%02x",
-               sccb_reg_read(gspca_dev, 0x0a),
-               sccb_reg_read(gspca_dev, 0x0b));
-
-       ov534_set_led(gspca_dev, 1);
-
-       /* Initialize sensor */
-       for (i = 0; i < ARRAY_SIZE(ov772x_reg_initdata); i++)
-               sccb_reg_write(gspca_dev, ov772x_reg_initdata[i][0],
-                              ov772x_reg_initdata[i][1]);
-
-       ov534_reg_write(gspca_dev, 0xe0, 0x09);
-       ov534_set_led(gspca_dev, 0);
-}
-
 /* this function is called at probe time */
 static int sd_config(struct gspca_dev *gspca_dev,
                     const struct usb_device_id *id)
 {
+       struct sd *sd = (struct sd *) gspca_dev;
        struct cam *cam;
 
+       sd->sensor = id->driver_info;
+
        cam = &gspca_dev->cam;
 
        cam->cam_mode = vga_mode;
@@ -391,26 +717,102 @@ static int sd_config(struct gspca_dev *gspca_dev,
 /* this function is called at probe and resume time */
 static int sd_init(struct gspca_dev *gspca_dev)
 {
-       ov534_setup(gspca_dev);
-       ov534_set_frame_rate(gspca_dev);
+       struct sd *sd = (struct sd *) gspca_dev;
+       u16 sensor_id;
+       static const u8 sensor_addr[2] = {
+               0x42,                   /* 0 SENSOR_OV772X */
+               0x60,                   /* 1 SENSOR_OV965X */
+       };
+
+       /* reset bridge */
+       ov534_reg_write(gspca_dev, 0xe7, 0x3a);
+       ov534_reg_write(gspca_dev, 0xe0, 0x08);
+       msleep(100);
+
+       /* initialize the sensor address */
+       ov534_reg_write(gspca_dev, OV534_REG_ADDRESS,
+                               sensor_addr[sd->sensor]);
+
+       /* reset sensor */
+       sccb_reg_write(gspca_dev, 0x12, 0x80);
+       msleep(10);
+
+       /* probe the sensor */
+       sccb_reg_read(gspca_dev, 0x0a);
+       sensor_id = sccb_reg_read(gspca_dev, 0x0a) << 8;
+       sccb_reg_read(gspca_dev, 0x0b);
+       sensor_id |= sccb_reg_read(gspca_dev, 0x0b);
+       PDEBUG(D_PROBE, "Sensor ID: %04x", sensor_id);
+
+       /* initialize */
+       switch (sd->sensor) {
+       case SENSOR_OV772X:
+               reg_w_array(gspca_dev, bridge_init_ov722x,
+                               ARRAY_SIZE(bridge_init_ov722x));
+               ov534_set_led(gspca_dev, 1);
+               sccb_w_array(gspca_dev, sensor_init_ov722x,
+                               ARRAY_SIZE(sensor_init_ov722x));
+               ov534_reg_write(gspca_dev, 0xe0, 0x09);
+               ov534_set_led(gspca_dev, 0);
+               ov534_set_frame_rate(gspca_dev);
+               break;
+       default:
+/*     case SENSOR_OV965X: */
+               reg_w_array(gspca_dev, bridge_init_ov965x,
+                               ARRAY_SIZE(bridge_init_ov965x));
+               sccb_w_array(gspca_dev, sensor_init_ov965x,
+                               ARRAY_SIZE(sensor_init_ov965x));
+               reg_w_array(gspca_dev, bridge_init_ov965x_2,
+                               ARRAY_SIZE(bridge_init_ov965x_2));
+               sccb_w_array(gspca_dev, sensor_init_ov965x_2,
+                               ARRAY_SIZE(sensor_init_ov965x_2));
+               ov534_reg_write(gspca_dev, 0xe0, 0x00);
+               ov534_reg_write(gspca_dev, 0xe0, 0x01);
+               ov534_set_led(gspca_dev, 0);
+               ov534_reg_write(gspca_dev, 0xe0, 0x00);
+       }
 
        return 0;
 }
 
 static int sd_start(struct gspca_dev *gspca_dev)
 {
-       /* start streaming data */
-       ov534_set_led(gspca_dev, 1);
-       ov534_reg_write(gspca_dev, 0xe0, 0x00);
+       struct sd *sd = (struct sd *) gspca_dev;
 
+       switch (sd->sensor) {
+       case SENSOR_OV772X:
+               ov534_set_led(gspca_dev, 1);
+               ov534_reg_write(gspca_dev, 0xe0, 0x00);
+               break;
+       default:
+/*     case SENSOR_OV965X: */
+               reg_w_array(gspca_dev, bridge_start_ov965x,
+                               ARRAY_SIZE(bridge_start_ov965x));
+               sccb_w_array(gspca_dev, sensor_start_ov965x,
+                               ARRAY_SIZE(sensor_start_ov965x));
+               ov534_reg_write(gspca_dev, 0xe0, 0x00);
+               ov534_set_led(gspca_dev, 1);
+/*fixme: other sensor start omitted*/
+       }
        return 0;
 }
 
 static void sd_stopN(struct gspca_dev *gspca_dev)
 {
-       /* stop streaming data */
-       ov534_reg_write(gspca_dev, 0xe0, 0x09);
-       ov534_set_led(gspca_dev, 0);
+       struct sd *sd = (struct sd *) gspca_dev;
+
+       switch (sd->sensor) {
+       case SENSOR_OV772X:
+               ov534_reg_write(gspca_dev, 0xe0, 0x09);
+               ov534_set_led(gspca_dev, 0);
+               break;
+       default:
+/*     case SENSOR_OV965X: */
+               ov534_reg_write(gspca_dev, 0xe0, 0x01);
+               ov534_set_led(gspca_dev, 0);
+               ov534_reg_write(gspca_dev, 0xe0, 0x00);
+               break;
+       }
 }
 
 /* Values for bmHeaderInfo (Video and Still Image Payload Headers, 2.4.3.3) */
@@ -555,7 +957,8 @@ static const struct sd_desc sd_desc = {
 
 /* -- module initialisation -- */
 static const __devinitdata struct usb_device_id device_table[] = {
-       {USB_DEVICE(0x1415, 0x2000)},   /* Sony HD Eye for PS3 (SLEH 00201) */
+       {USB_DEVICE(0x06f8, 0x3003), .driver_info = SENSOR_OV965X},
+       {USB_DEVICE(0x1415, 0x2000), .driver_info = SENSOR_OV772X},
        {}
 };