diff options
author | Erik Andrén <erik.andren@gmail.com> | 2008-12-23 12:08:07 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-30 06:40:03 -0500 |
commit | 1b0b27b87fcae1cfbfa74b544bcf452797be7af1 (patch) | |
tree | 538eb1b9cf52698d67a88e5f9b389fabb4e703c9 /drivers | |
parent | 3b2f3327ff5af235837bc83c6b788bc560ba23a6 (diff) |
V4L/DVB (10038): m5602: tweak the hsync. Remove redundant init sequence
Signed-off-by: Erik Andrén <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/media/video/gspca/m5602/m5602_ov9650.h | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/media/video/gspca/m5602/m5602_ov9650.h b/drivers/media/video/gspca/m5602/m5602_ov9650.h index 636dce61c49d..b577017f6e55 100644 --- a/drivers/media/video/gspca/m5602/m5602_ov9650.h +++ b/drivers/media/video/gspca/m5602/m5602_ov9650.h | |||
@@ -328,6 +328,7 @@ static const unsigned char init_ov9650[][3] = | |||
328 | {BRIDGE, M5602_XB_GPIO_DAT_H, 0x00}, | 328 | {BRIDGE, M5602_XB_GPIO_DAT_H, 0x00}, |
329 | {BRIDGE, M5602_XB_GPIO_DAT, 0x00}, | 329 | {BRIDGE, M5602_XB_GPIO_DAT, 0x00}, |
330 | {BRIDGE, M5602_XB_I2C_CLK_DIV, 0x0a}, | 330 | {BRIDGE, M5602_XB_I2C_CLK_DIV, 0x0a}, |
331 | |||
331 | /* Reset chip */ | 332 | /* Reset chip */ |
332 | {SENSOR, OV9650_COM7, OV9650_REGISTER_RESET}, | 333 | {SENSOR, OV9650_COM7, OV9650_REGISTER_RESET}, |
333 | /* Enable double clock */ | 334 | /* Enable double clock */ |
@@ -335,8 +336,6 @@ static const unsigned char init_ov9650[][3] = | |||
335 | /* Do something out of spec with the power */ | 336 | /* Do something out of spec with the power */ |
336 | {SENSOR, OV9650_OFON, 0x40}, | 337 | {SENSOR, OV9650_OFON, 0x40}, |
337 | 338 | ||
338 | /* Set QQVGA */ | ||
339 | {SENSOR, OV9650_COM1, 0x20}, | ||
340 | /* Set fast AGC/AEC algorithm with unlimited step size */ | 339 | /* Set fast AGC/AEC algorithm with unlimited step size */ |
341 | {SENSOR, OV9650_COM8, OV9650_FAST_AGC_AEC | | 340 | {SENSOR, OV9650_COM8, OV9650_FAST_AGC_AEC | |
342 | OV9650_AEC_UNLIM_STEP_SIZE | | 341 | OV9650_AEC_UNLIM_STEP_SIZE | |
@@ -409,10 +408,6 @@ static const unsigned char init_ov9650[][3] = | |||
409 | {SENSOR, OV9650_VSTOP, 0x7e}, | 408 | {SENSOR, OV9650_VSTOP, 0x7e}, |
410 | /* Set complementing vertical frame control */ | 409 | /* Set complementing vertical frame control */ |
411 | {SENSOR, OV9650_VREF, 0x10}, | 410 | {SENSOR, OV9650_VREF, 0x10}, |
412 | /* Set raw RGB output format with VGA resolution */ | ||
413 | {SENSOR, OV9650_COM7, OV9650_VGA_SELECT | | ||
414 | OV9650_RGB_SELECT | | ||
415 | OV9650_RAW_RGB_SELECT}, | ||
416 | {SENSOR, OV9650_ADC, 0x04}, | 411 | {SENSOR, OV9650_ADC, 0x04}, |
417 | {SENSOR, OV9650_HV, 0x40}, | 412 | {SENSOR, OV9650_HV, 0x40}, |
418 | /* Enable denoise, and white-pixel erase */ | 413 | /* Enable denoise, and white-pixel erase */ |
@@ -469,9 +464,9 @@ static const unsigned char VGA_ov9650[][3] = | |||
469 | {BRIDGE, M5602_XB_VSYNC_PARA, 0x00}, | 464 | {BRIDGE, M5602_XB_VSYNC_PARA, 0x00}, |
470 | {BRIDGE, M5602_XB_VSYNC_PARA, 0x00}, | 465 | {BRIDGE, M5602_XB_VSYNC_PARA, 0x00}, |
471 | {BRIDGE, M5602_XB_HSYNC_PARA, 0x00}, | 466 | {BRIDGE, M5602_XB_HSYNC_PARA, 0x00}, |
472 | {BRIDGE, M5602_XB_HSYNC_PARA, 0x64}, /* 100 */ | 467 | {BRIDGE, M5602_XB_HSYNC_PARA, 0x62}, /* 98 */ |
473 | {BRIDGE, M5602_XB_HSYNC_PARA, 0x02}, /* 640 + 100 */ | 468 | {BRIDGE, M5602_XB_HSYNC_PARA, 0x02}, /* 640 + 98 */ |
474 | {BRIDGE, M5602_XB_HSYNC_PARA, 0xe4} | 469 | {BRIDGE, M5602_XB_HSYNC_PARA, 0xe2} |
475 | }; | 470 | }; |
476 | 471 | ||
477 | static const unsigned char QVGA_ov9650[][3] = | 472 | static const unsigned char QVGA_ov9650[][3] = |