提交 965b37a4 编写于 作者: J Jose Alberto Reguero 提交者: Mauro Carvalho Chehab

[media] gspca - ov534_9: New sensor ov5621 and webcam 05a9:1550

This path add support to "OmniVision Technologies, Inc. VEHO Filmscanner".
Signed-off-by: NJose Alberto Reguero <jareguero@telefonica.net>
Signed-off-by: NJean-François Moine <moinejf@free.fr>
Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
上级 2a5fc873
...@@ -189,6 +189,7 @@ ov519 05a9:0511 Video Blaster WebCam 3/WebCam Plus, D-Link USB Digital Video Ca ...@@ -189,6 +189,7 @@ ov519 05a9:0511 Video Blaster WebCam 3/WebCam Plus, D-Link USB Digital Video Ca
ov519 05a9:0518 Creative WebCam ov519 05a9:0518 Creative WebCam
ov519 05a9:0519 OV519 Microphone ov519 05a9:0519 OV519 Microphone
ov519 05a9:0530 OmniVision ov519 05a9:0530 OmniVision
ov534_9 05a9:1550 OmniVision VEHO Filmscanner
ov519 05a9:2800 OmniVision SuperCAM ov519 05a9:2800 OmniVision SuperCAM
ov519 05a9:4519 Webcam Classic ov519 05a9:4519 Webcam Classic
ov534_9 05a9:8065 OmniVision test kit ov538+ov9712 ov534_9 05a9:8065 OmniVision test kit ov538+ov9712
......
...@@ -71,6 +71,7 @@ struct sd { ...@@ -71,6 +71,7 @@ struct sd {
enum sensors { enum sensors {
SENSOR_OV965x, /* ov9657 */ SENSOR_OV965x, /* ov9657 */
SENSOR_OV971x, /* ov9712 */ SENSOR_OV971x, /* ov9712 */
SENSOR_OV562x, /* ov5621 */
NSENSORS NSENSORS
}; };
...@@ -207,6 +208,14 @@ static const struct v4l2_pix_format ov971x_mode[] = { ...@@ -207,6 +208,14 @@ static const struct v4l2_pix_format ov971x_mode[] = {
} }
}; };
static const struct v4l2_pix_format ov562x_mode[] = {
{2592, 1680, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,
.bytesperline = 2592,
.sizeimage = 2592 * 1680,
.colorspace = V4L2_COLORSPACE_SRGB
}
};
static const u8 bridge_init[][2] = { static const u8 bridge_init[][2] = {
{0x88, 0xf8}, {0x88, 0xf8},
{0x89, 0xff}, {0x89, 0xff},
...@@ -830,6 +839,124 @@ static const u8 ov965x_start_2_sxga[][2] = { ...@@ -830,6 +839,124 @@ static const u8 ov965x_start_2_sxga[][2] = {
{0xa3, 0x41}, /* bd60 */ {0xa3, 0x41}, /* bd60 */
}; };
static const u8 ov562x_init[][2] = {
{0x88, 0x20},
{0x89, 0x0a},
{0x8a, 0x90},
{0x8b, 0x06},
{0x8c, 0x01},
{0x8d, 0x10},
{0x1c, 0x00},
{0x1d, 0x48},
{0x1d, 0x00},
{0x1d, 0xff},
{0x1c, 0x0a},
{0x1d, 0x2e},
{0x1d, 0x1e},
};
static const u8 ov562x_init_2[][2] = {
{0x12, 0x80},
{0x11, 0x41},
{0x13, 0x00},
{0x10, 0x1e},
{0x3b, 0x07},
{0x5b, 0x40},
{0x39, 0x07},
{0x53, 0x02},
{0x54, 0x60},
{0x04, 0x20},
{0x27, 0x04},
{0x3d, 0x40},
{0x36, 0x00},
{0xc5, 0x04},
{0x4e, 0x00},
{0x4f, 0x93},
{0x50, 0x7b},
{0xca, 0x0c},
{0xcb, 0x0f},
{0x39, 0x07},
{0x4a, 0x10},
{0x3e, 0x0a},
{0x3d, 0x00},
{0x0c, 0x38},
{0x38, 0x90},
{0x46, 0x30},
{0x4f, 0x93},
{0x50, 0x7b},
{0xab, 0x00},
{0xca, 0x0c},
{0xcb, 0x0f},
{0x37, 0x02},
{0x44, 0x48},
{0x8d, 0x44},
{0x2a, 0x00},
{0x2b, 0x00},
{0x32, 0x00},
{0x38, 0x90},
{0x53, 0x02},
{0x54, 0x60},
{0x12, 0x00},
{0x17, 0x12},
{0x18, 0xb4},
{0x19, 0x0c},
{0x1a, 0xf4},
{0x03, 0x4a},
{0x89, 0x20},
{0x83, 0x80},
{0xb7, 0x9d},
{0xb6, 0x11},
{0xb5, 0x55},
{0xb4, 0x00},
{0xa9, 0xf0},
{0xa8, 0x0a},
{0xb8, 0xf0},
{0xb9, 0xf0},
{0xba, 0xf0},
{0x81, 0x07},
{0x63, 0x44},
{0x13, 0xc7},
{0x14, 0x60},
{0x33, 0x75},
{0x2c, 0x00},
{0x09, 0x00},
{0x35, 0x30},
{0x27, 0x04},
{0x3c, 0x07},
{0x3a, 0x0a},
{0x3b, 0x07},
{0x01, 0x40},
{0x02, 0x40},
{0x16, 0x40},
{0x52, 0xb0},
{0x51, 0x83},
{0x21, 0xbb},
{0x22, 0x10},
{0x23, 0x03},
{0x35, 0x38},
{0x20, 0x90},
{0x28, 0x30},
{0x73, 0xe1},
{0x6c, 0x00},
{0x6d, 0x80},
{0x6e, 0x00},
{0x70, 0x04},
{0x71, 0x00},
{0x8d, 0x04},
{0x64, 0x00},
{0x65, 0x00},
{0x66, 0x00},
{0x67, 0x00},
{0x68, 0x00},
{0x69, 0x00},
{0x6a, 0x00},
{0x6b, 0x00},
{0x71, 0x94},
{0x74, 0x20},
{0x80, 0x09},
{0x85, 0xc0},
};
static void reg_w_i(struct gspca_dev *gspca_dev, u16 reg, u8 val) static void reg_w_i(struct gspca_dev *gspca_dev, u16 reg, u8 val)
{ {
struct usb_device *udev = gspca_dev->dev; struct usb_device *udev = gspca_dev->dev;
...@@ -1210,6 +1337,17 @@ static int sd_init(struct gspca_dev *gspca_dev) ...@@ -1210,6 +1337,17 @@ static int sd_init(struct gspca_dev *gspca_dev)
reg_w(gspca_dev, 0x56, 0x1f); reg_w(gspca_dev, 0x56, 0x1f);
else else
reg_w(gspca_dev, 0x56, 0x17); reg_w(gspca_dev, 0x56, 0x17);
} else if ((sensor_id & 0xfff0) == 0x5620) {
sd->sensor = SENSOR_OV562x;
gspca_dev->cam.cam_mode = ov562x_mode;
gspca_dev->cam.nmodes = ARRAY_SIZE(ov562x_mode);
reg_w_array(gspca_dev, ov562x_init,
ARRAY_SIZE(ov562x_init));
sccb_w_array(gspca_dev, ov562x_init_2,
ARRAY_SIZE(ov562x_init_2));
reg_w(gspca_dev, 0xe0, 0x00);
} else { } else {
err("Unknown sensor %04x", sensor_id); err("Unknown sensor %04x", sensor_id);
return -EINVAL; return -EINVAL;
...@@ -1222,7 +1360,7 @@ static int sd_start(struct gspca_dev *gspca_dev) ...@@ -1222,7 +1360,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
{ {
struct sd *sd = (struct sd *) gspca_dev; struct sd *sd = (struct sd *) gspca_dev;
if (sd->sensor == SENSOR_OV971x) if (sd->sensor == SENSOR_OV971x || sd->sensor == SENSOR_OV562x)
return gspca_dev->usb_err; return gspca_dev->usb_err;
switch (gspca_dev->curr_mode) { switch (gspca_dev->curr_mode) {
case QVGA_MODE: /* 320x240 */ case QVGA_MODE: /* 320x240 */
...@@ -1409,6 +1547,7 @@ static const struct sd_desc sd_desc = { ...@@ -1409,6 +1547,7 @@ static const struct sd_desc sd_desc = {
static const struct usb_device_id device_table[] = { static const struct usb_device_id device_table[] = {
{USB_DEVICE(0x05a9, 0x8065)}, {USB_DEVICE(0x05a9, 0x8065)},
{USB_DEVICE(0x06f8, 0x3003)}, {USB_DEVICE(0x06f8, 0x3003)},
{USB_DEVICE(0x05a9, 0x1550)},
{} {}
}; };
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册