renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-27 08:05:27 +08:00
Code

V4L/DVB (10037): m5602: add QVGA mode for the ov9650 sensor

Browse Source 
Signed-off-by: Erik Andrén <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Erik Andrén 2008-12-22 16:06:29 -03:00 committed by Mauro Carvalho Chehab
parent 082aa8937c
commit 3b2f3327ff
2 changed files with 51 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/media/video/gspca/m5602/m5602_ov9650.c
View File

@ -150,7 +150,6 @@ int ov9650_start(struct sd *sd)
switch (cam->cam_mode[sd->gspca_dev.curr_mode].width)
{
default:
case 640:
PDEBUG(D_V4L2, "Configuring camera for VGA mode");
@ -163,6 +162,19 @@ int ov9650_start(struct sd *sd)
err = m5602_write_bridge(sd, VGA_ov9650[i][1], data);
}
break;
case 320:
PDEBUG(D_V4L2, "Configuring camera for QVGA mode");
for (i = 0; i < ARRAY_SIZE(QVGA_ov9650) && !err; i++) {
u8 data = QVGA_ov9650[i][2];
if (QVGA_ov9650[i][0] == SENSOR)
err = m5602_write_sensor(sd,
QVGA_ov9650[i][1], &data, 1);
else
err = m5602_write_bridge(sd, QVGA_ov9650[i][1], data);
}
break;
}
return err;
}

40
drivers/media/video/gspca/m5602/m5602_ov9650.h
View File

@ -20,7 +20,6 @@
#define M5602_OV9650_H_
#include <linux/dmi.h>
#include "m5602_sensor.h"
/*****************************************************************************/
@ -94,6 +93,7 @@
#define OV9650_REGISTER_RESET (1 << 7)
#define OV9650_VGA_SELECT (1 << 6)
#define OV9650_QVGA_SELECT (1 << 4)
#define OV9650_RGB_SELECT (1 << 2)
#define OV9650_RAW_RGB_SELECT (1 << 0)
@ -258,9 +258,19 @@ static struct m5602_sensor ov9650 = {
}
},
.nmodes = 1,
.nmodes = 2,
.modes = {
{
320,
240,
V4L2_PIX_FMT_SBGGR8,
V4L2_FIELD_NONE,
.sizeimage =
320 * 240,
.bytesperline = 320,
.colorspace = V4L2_COLORSPACE_SRGB,
.priv = 0
}, {
640,
480,
V4L2_PIX_FMT_SBGGR8,
@ -464,4 +474,30 @@ static const unsigned char VGA_ov9650[][3] =
{BRIDGE, M5602_XB_HSYNC_PARA, 0xe4}
};
static const unsigned char QVGA_ov9650[][3] =
{
{SENSOR, OV9650_COM7, OV9650_QVGA_SELECT |
OV9650_RGB_SELECT |
OV9650_RAW_RGB_SELECT},
{BRIDGE, M5602_XB_LINE_OF_FRAME_H, 0x82},
{BRIDGE, M5602_XB_LINE_OF_FRAME_L, 0x00},
{BRIDGE, M5602_XB_PIX_OF_LINE_H, 0x82},
{BRIDGE, M5602_XB_PIX_OF_LINE_L, 0x00},
{BRIDGE, M5602_XB_SIG_INI, 0x01},
/* Moves the view window in a vertical orientation */
{BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
{BRIDGE, M5602_XB_VSYNC_PARA, 0x08},
{BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
{BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
{BRIDGE, M5602_XB_VSYNC_PARA, 0xf0}, /* 240 */
{BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
{BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
{BRIDGE, M5602_XB_HSYNC_PARA, 0x00},
{BRIDGE, M5602_XB_HSYNC_PARA, 0x31}, /* 50 */
{BRIDGE, M5602_XB_HSYNC_PARA, 0x01}, /* 320 + 50 */
{BRIDGE, M5602_XB_HSYNC_PARA, 0x71}
};
#endif