diff options
| author | Jeff Kudrick <jeff.kudrick@freescale.com> | 2012-06-11 13:02:40 -0500 |
|---|---|---|
| committer | Jeff Kudrick <jeff.kudrick@freescale.com> | 2012-06-11 13:02:40 -0500 |
| commit | dfab7be58bc1ae8910fe363c8ab78f63483cf613 (patch) | |
| tree | 6e6670d84fa96d724defbd1d15b0f885ad60a7c3 /drivers/media/video/mxc/capture/ov5642.c | |
| parent | 569dc9187a890c0b04779df0af882df69fd093aa (diff) | |
ENGR00211151: Cannot connect to Camera after start/stop Camcorder many times
Aligned latest i.MX6 ICS 3.0.15 kernel changes for media processing and
Camera support.
Signed-off-by: Jeff Kudrick <jeff.kudrick@freescale.com>
Diffstat (limited to 'drivers/media/video/mxc/capture/ov5642.c')
| -rw-r--r-- | drivers/media/video/mxc/capture/ov5642.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/video/mxc/capture/ov5642.c b/drivers/media/video/mxc/capture/ov5642.c index f8f8a6c12ab4..58ee92eef678 100644 --- a/drivers/media/video/mxc/capture/ov5642.c +++ b/drivers/media/video/mxc/capture/ov5642.c @@ -279,7 +279,7 @@ static struct reg_value ov5642_initial_setting[] = { {0x5007, 0x00, 0, 0}, {0x5009, 0x00, 0, 0}, {0x5011, 0x00, 0, 0}, {0x5013, 0x00, 0, 0}, {0x519e, 0x00, 0, 0}, {0x5086, 0x00, 0, 0}, {0x5087, 0x00, 0, 0}, {0x5088, 0x00, 0, 0}, {0x5089, 0x00, 0, 0}, - {0x302b, 0x00, 0, 0}, + {0x302b, 0x00, 0, 300}, }; static struct reg_value ov5642_setting_15fps_QCIF_176_144[] = { @@ -3255,7 +3255,7 @@ static int ioctl_dev_init(struct v4l2_int_device *s) ov5642_data.mclk = tgt_xclk; pr_debug(" Setting mclk to %d MHz\n", tgt_xclk / 1000000); - set_mclk_rate(&ov5642_data.mclk, ov5642_data.csi); + set_mclk_rate(&ov5642_data.mclk, ov5642_data.mclk_source); /* Default camera frame rate is set in probe */ tgt_fps = sensor->streamcap.timeperframe.denominator / @@ -3368,6 +3368,7 @@ static int ov5642_probe(struct i2c_client *client, memset(&ov5642_data, 0, sizeof(ov5642_data)); ov5642_data.mclk = 24000000; /* 6 - 54 MHz, typical 24MHz */ ov5642_data.mclk = plat_data->mclk; + ov5642_data.mclk_source = plat_data->mclk_source; ov5642_data.csi = plat_data->csi; ov5642_data.io_init = plat_data->io_init; |