diff options
Diffstat (limited to 'drivers/media/video/gspca/ov519.c')
-rw-r--r-- | drivers/media/video/gspca/ov519.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/drivers/media/video/gspca/ov519.c b/drivers/media/video/gspca/ov519.c index 2417a7e70a42..6cf6855aa506 100644 --- a/drivers/media/video/gspca/ov519.c +++ b/drivers/media/video/gspca/ov519.c | |||
@@ -415,10 +415,10 @@ static const struct v4l2_pix_format ovfx2_ov3610_mode[] = { | |||
415 | 415 | ||
416 | /* Registers common to OV511 / OV518 */ | 416 | /* Registers common to OV511 / OV518 */ |
417 | #define R51x_FIFO_PSIZE 0x30 /* 2 bytes wide w/ OV518(+) */ | 417 | #define R51x_FIFO_PSIZE 0x30 /* 2 bytes wide w/ OV518(+) */ |
418 | #define R51x_SYS_RESET 0x50 | 418 | #define R51x_SYS_RESET 0x50 |
419 | /* Reset type flags */ | 419 | /* Reset type flags */ |
420 | #define OV511_RESET_OMNICE 0x08 | 420 | #define OV511_RESET_OMNICE 0x08 |
421 | #define R51x_SYS_INIT 0x53 | 421 | #define R51x_SYS_INIT 0x53 |
422 | #define R51x_SYS_SNAP 0x52 | 422 | #define R51x_SYS_SNAP 0x52 |
423 | #define R51x_SYS_CUST_ID 0x5F | 423 | #define R51x_SYS_CUST_ID 0x5F |
424 | #define R51x_COMP_LUT_BEGIN 0x80 | 424 | #define R51x_COMP_LUT_BEGIN 0x80 |
@@ -603,13 +603,11 @@ struct ov_i2c_regvals { | |||
603 | }; | 603 | }; |
604 | 604 | ||
605 | /* Settings for OV2610 camera chip */ | 605 | /* Settings for OV2610 camera chip */ |
606 | static const struct ov_i2c_regvals norm_2610[] = | 606 | static const struct ov_i2c_regvals norm_2610[] = { |
607 | { | ||
608 | { 0x12, 0x80 }, /* reset */ | 607 | { 0x12, 0x80 }, /* reset */ |
609 | }; | 608 | }; |
610 | 609 | ||
611 | static const struct ov_i2c_regvals norm_3620b[] = | 610 | static const struct ov_i2c_regvals norm_3620b[] = { |
612 | { | ||
613 | /* | 611 | /* |
614 | * From the datasheet: "Note that after writing to register COMH | 612 | * From the datasheet: "Note that after writing to register COMH |
615 | * (0x12) to change the sensor mode, registers related to the | 613 | * (0x12) to change the sensor mode, registers related to the |
@@ -2779,7 +2777,7 @@ static int ov511_configure(struct gspca_dev *gspca_dev) | |||
2779 | }; | 2777 | }; |
2780 | 2778 | ||
2781 | const struct ov_regvals norm_511[] = { | 2779 | const struct ov_regvals norm_511[] = { |
2782 | { R511_DRAM_FLOW_CTL, 0x01 }, | 2780 | { R511_DRAM_FLOW_CTL, 0x01 }, |
2783 | { R51x_SYS_SNAP, 0x00 }, | 2781 | { R51x_SYS_SNAP, 0x00 }, |
2784 | { R51x_SYS_SNAP, 0x02 }, | 2782 | { R51x_SYS_SNAP, 0x02 }, |
2785 | { R51x_SYS_SNAP, 0x00 }, | 2783 | { R51x_SYS_SNAP, 0x00 }, |
@@ -2863,7 +2861,7 @@ static int ov518_configure(struct gspca_dev *gspca_dev) | |||
2863 | const struct ov_regvals norm_518[] = { | 2861 | const struct ov_regvals norm_518[] = { |
2864 | { R51x_SYS_SNAP, 0x02 }, /* Reset */ | 2862 | { R51x_SYS_SNAP, 0x02 }, /* Reset */ |
2865 | { R51x_SYS_SNAP, 0x01 }, /* Enable */ | 2863 | { R51x_SYS_SNAP, 0x01 }, /* Enable */ |
2866 | { 0x31, 0x0f }, | 2864 | { 0x31, 0x0f }, |
2867 | { 0x5d, 0x03 }, | 2865 | { 0x5d, 0x03 }, |
2868 | { 0x24, 0x9f }, | 2866 | { 0x24, 0x9f }, |
2869 | { 0x25, 0x90 }, | 2867 | { 0x25, 0x90 }, |
@@ -2876,7 +2874,7 @@ static int ov518_configure(struct gspca_dev *gspca_dev) | |||
2876 | const struct ov_regvals norm_518_p[] = { | 2874 | const struct ov_regvals norm_518_p[] = { |
2877 | { R51x_SYS_SNAP, 0x02 }, /* Reset */ | 2875 | { R51x_SYS_SNAP, 0x02 }, /* Reset */ |
2878 | { R51x_SYS_SNAP, 0x01 }, /* Enable */ | 2876 | { R51x_SYS_SNAP, 0x01 }, /* Enable */ |
2879 | { 0x31, 0x0f }, | 2877 | { 0x31, 0x0f }, |
2880 | { 0x5d, 0x03 }, | 2878 | { 0x5d, 0x03 }, |
2881 | { 0x24, 0x9f }, | 2879 | { 0x24, 0x9f }, |
2882 | { 0x25, 0x90 }, | 2880 | { 0x25, 0x90 }, |
@@ -3653,7 +3651,7 @@ static int mode_init_ov_sensor_regs(struct sd *sd) | |||
3653 | break; | 3651 | break; |
3654 | case SEN_OV7610: | 3652 | case SEN_OV7610: |
3655 | i2c_w_mask(sd, 0x14, qvga ? 0x20 : 0x00, 0x20); | 3653 | i2c_w_mask(sd, 0x14, qvga ? 0x20 : 0x00, 0x20); |
3656 | i2c_w(sd, 0x35, qvga?0x1e:0x9e); | 3654 | i2c_w(sd, 0x35, qvga ? 0x1e : 0x9e); |
3657 | i2c_w_mask(sd, 0x13, 0x00, 0x20); /* Select 16 bit data bus */ | 3655 | i2c_w_mask(sd, 0x13, 0x00, 0x20); /* Select 16 bit data bus */ |
3658 | i2c_w_mask(sd, 0x12, 0x04, 0x06); /* AWB: 1 Test pattern: 0 */ | 3656 | i2c_w_mask(sd, 0x12, 0x04, 0x06); /* AWB: 1 Test pattern: 0 */ |
3659 | break; | 3657 | break; |