Skip to content

L
linux
Commit 27b1e4ca authored by Erik Andrén's avatar Erik Andrén Committed by Mauro Carvalho Chehab
Browse files
Options

V4L/DVB (10041): m5602 - rework parts of the resolution initialization 

Signed-off-by: default avatarErik Andrén <erik.andren@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 1f614f40
Show whitespace changes
Inline Side-by-side
Showing with 32 additions and 35 deletions
drivers/media/video/gspca/m5602/m5602_ov9650.c
View file @ 27b1e4ca
...@@ -139,7 +139,6 @@ int ov9650_init(struct sd *sd) ...@@ -139,7 +139,6 @@ int ov9650_init(struct sd *sd)
data = 0x30; data = 0x30;
err = m5602_write_sensor(sd, OV9650_MVFP, &data, 1); err = m5602_write_sensor(sd, OV9650_MVFP, &data, 1);
} }
return err; return err;
} }
...@@ -148,6 +147,13 @@ int ov9650_start(struct sd *sd) ...@@ -148,6 +147,13 @@ int ov9650_start(struct sd *sd)
int i, err = 0; int i, err = 0;
struct cam *cam = &sd->gspca_dev.cam; struct cam *cam = &sd->gspca_dev.cam;
for (i = 0; i < ARRAY_SIZE(res_init_ov9650) && !err; i++) {
u8 data = res_init_ov9650[i][1];
err = m5602_write_bridge(sd, res_init_ov9650[i][0], data);
}
if (err < 0)
return err;
switch (cam->cam_mode[sd->gspca_dev.curr_mode].width) switch (cam->cam_mode[sd->gspca_dev.curr_mode].width)
{ {
case 640: case 640:
......
drivers/media/video/gspca/m5602/m5602_ov9650.h
View file @ 27b1e4ca
...@@ -458,21 +458,20 @@ static const unsigned char power_down_ov9650[][3] = ...@@ -458,21 +458,20 @@ static const unsigned char power_down_ov9650[][3] =
{BRIDGE, M5602_XB_GPIO_EN_L, 0x06}, {BRIDGE, M5602_XB_GPIO_EN_L, 0x06},
{BRIDGE, M5602_XB_GPIO_DAT_H, 0x02}, {BRIDGE, M5602_XB_GPIO_DAT_H, 0x02},
{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x04}, {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x04},
{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0} {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
}; };
static const unsigned char VGA_ov9650[][3] = static const unsigned char res_init_ov9650[][2] =
{ {
{SENSOR, OV9650_COM7, OV9650_VGA_SELECT | {M5602_XB_LINE_OF_FRAME_H, 0x82},
OV9650_RGB_SELECT | {M5602_XB_LINE_OF_FRAME_L, 0x00},
OV9650_RAW_RGB_SELECT}, {M5602_XB_PIX_OF_LINE_H, 0x82},
{M5602_XB_PIX_OF_LINE_L, 0x00},
{BRIDGE, M5602_XB_LINE_OF_FRAME_H, 0x82}, {M5602_XB_SIG_INI, 0x01}
{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},
static const unsigned char VGA_ov9650[][3] =
{
/* Moves the view window in a vertical orientation */ /* Moves the view window in a vertical orientation */
{BRIDGE, M5602_XB_VSYNC_PARA, 0x00}, {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
{BRIDGE, M5602_XB_VSYNC_PARA, 0x09}, {BRIDGE, M5602_XB_VSYNC_PARA, 0x09},
...@@ -484,21 +483,15 @@ static const unsigned char VGA_ov9650[][3] = ...@@ -484,21 +483,15 @@ static const unsigned char VGA_ov9650[][3] =
{BRIDGE, M5602_XB_HSYNC_PARA, 0x00}, {BRIDGE, M5602_XB_HSYNC_PARA, 0x00},
{BRIDGE, M5602_XB_HSYNC_PARA, 0x62}, /* 98 */ {BRIDGE, M5602_XB_HSYNC_PARA, 0x62}, /* 98 */
{BRIDGE, M5602_XB_HSYNC_PARA, 0x02}, /* 640 + 98 */ {BRIDGE, M5602_XB_HSYNC_PARA, 0x02}, /* 640 + 98 */
{BRIDGE, M5602_XB_HSYNC_PARA, 0xe2} {BRIDGE, M5602_XB_HSYNC_PARA, 0xe2},
};
static const unsigned char CIF_ov9650[][3] = {SENSOR, OV9650_COM7, OV9650_VGA_SELECT |
{
{SENSOR, OV9650_COM7, OV9650_CIF_SELECT |
OV9650_RGB_SELECT | OV9650_RGB_SELECT |
OV9650_RAW_RGB_SELECT}, OV9650_RAW_RGB_SELECT},
};
{BRIDGE, M5602_XB_LINE_OF_FRAME_H, 0x82}, static const unsigned char CIF_ov9650[][3] =
{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 */ /* Moves the view window in a vertical orientation */
{BRIDGE, M5602_XB_VSYNC_PARA, 0x00}, {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
{BRIDGE, M5602_XB_VSYNC_PARA, 0x09}, {BRIDGE, M5602_XB_VSYNC_PARA, 0x09},
...@@ -510,21 +503,15 @@ static const unsigned char CIF_ov9650[][3] = ...@@ -510,21 +503,15 @@ static const unsigned char CIF_ov9650[][3] =
{BRIDGE, M5602_XB_HSYNC_PARA, 0x00}, {BRIDGE, M5602_XB_HSYNC_PARA, 0x00},
{BRIDGE, M5602_XB_HSYNC_PARA, 0x62}, /* 98 */ {BRIDGE, M5602_XB_HSYNC_PARA, 0x62}, /* 98 */
{BRIDGE, M5602_XB_HSYNC_PARA, 0x01}, /* 352 + 98 */ {BRIDGE, M5602_XB_HSYNC_PARA, 0x01}, /* 352 + 98 */
{BRIDGE, M5602_XB_HSYNC_PARA, 0xc2} {BRIDGE, M5602_XB_HSYNC_PARA, 0xc2},
};
static const unsigned char QVGA_ov9650[][3] = {SENSOR, OV9650_COM7, OV9650_CIF_SELECT |
{
{SENSOR, OV9650_COM7, OV9650_QVGA_SELECT |
OV9650_RGB_SELECT | OV9650_RGB_SELECT |
OV9650_RAW_RGB_SELECT}, OV9650_RAW_RGB_SELECT},
};
{BRIDGE, M5602_XB_LINE_OF_FRAME_H, 0x82}, static const unsigned char QVGA_ov9650[][3] =
{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 */ /* Moves the view window in a vertical orientation */
{BRIDGE, M5602_XB_VSYNC_PARA, 0x00}, {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
{BRIDGE, M5602_XB_VSYNC_PARA, 0x08}, {BRIDGE, M5602_XB_VSYNC_PARA, 0x08},
...@@ -536,7 +523,11 @@ static const unsigned char QVGA_ov9650[][3] = ...@@ -536,7 +523,11 @@ static const unsigned char QVGA_ov9650[][3] =
{BRIDGE, M5602_XB_HSYNC_PARA, 0x00}, {BRIDGE, M5602_XB_HSYNC_PARA, 0x00},
{BRIDGE, M5602_XB_HSYNC_PARA, 0x31}, /* 50 */ {BRIDGE, M5602_XB_HSYNC_PARA, 0x31}, /* 50 */
{BRIDGE, M5602_XB_HSYNC_PARA, 0x01}, /* 320 + 50 */ {BRIDGE, M5602_XB_HSYNC_PARA, 0x01}, /* 320 + 50 */
{BRIDGE, M5602_XB_HSYNC_PARA, 0x71} {BRIDGE, M5602_XB_HSYNC_PARA, 0x71},
{SENSOR, OV9650_COM7, OV9650_QVGA_SELECT |
OV9650_RGB_SELECT |
OV9650_RAW_RGB_SELECT},
}; };
#endif #endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7