From dfab7be58bc1ae8910fe363c8ab78f63483cf613 Mon Sep 17 00:00:00 2001 From: Jeff Kudrick Date: Mon, 11 Jun 2012 13:02:40 -0500 Subject: 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 --- drivers/media/video/mxc/capture/ov5640.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'drivers/media/video/mxc/capture/ov5640.c') diff --git a/drivers/media/video/mxc/capture/ov5640.c b/drivers/media/video/mxc/capture/ov5640.c index f9087499b5f1..c2dfe314c65d 100644 --- a/drivers/media/video/mxc/capture/ov5640.c +++ b/drivers/media/video/mxc/capture/ov5640.c @@ -1309,7 +1309,7 @@ static int ioctl_dev_init(struct v4l2_int_device *s) ov5640_data.mclk = tgt_xclk; pr_debug(" Setting mclk to %d MHz\n", tgt_xclk / 1000000); - set_mclk_rate(&ov5640_data.mclk, ov5640_data.csi); + set_mclk_rate(&ov5640_data.mclk, ov5640_data.mclk_source); /* Default camera frame rate is set in probe */ tgt_fps = sensor->streamcap.timeperframe.denominator / @@ -1397,6 +1397,7 @@ static int ov5640_probe(struct i2c_client *client, memset(&ov5640_data, 0, sizeof(ov5640_data)); ov5640_data.mclk = 24000000; /* 6 - 54 MHz, typical 24MHz */ ov5640_data.mclk = plat_data->mclk; + ov5640_data.mclk_source = plat_data->mclk_source; ov5640_data.csi = plat_data->csi; ov5640_data.io_init = plat_data->io_init; -- cgit v1.2.3