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/ov8820_mipi.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/ov8820_mipi.c')
| -rw-r--r-- | drivers/media/video/mxc/capture/ov8820_mipi.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/video/mxc/capture/ov8820_mipi.c b/drivers/media/video/mxc/capture/ov8820_mipi.c index 4c2a49d8bef5..6fddbb03fc0b 100644 --- a/drivers/media/video/mxc/capture/ov8820_mipi.c +++ b/drivers/media/video/mxc/capture/ov8820_mipi.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright (C) 2011-2012 Freescale Semiconductor, Inc. All Rights Reserved. */ /* @@ -92,6 +92,7 @@ struct sensor { int ae_mode; u32 mclk; + u8 mclk_source; int csi; } ov8820_data; @@ -762,7 +763,7 @@ static int ioctl_dev_init(struct v4l2_int_device *s) ov8820_data.mclk = tgt_xclk; pr_debug(" Setting mclk to %d MHz\n", tgt_xclk / 1000000); - set_mclk_rate(&ov8820_data.mclk, ov8820_data.csi); + set_mclk_rate(&ov8820_data.mclk, ov8820_data.mclk_source); /* Default camera frame rate is set in probe */ tgt_fps = sensor->streamcap.timeperframe.denominator / @@ -871,6 +872,7 @@ static int ov8820_probe(struct i2c_client *client, memset(&ov8820_data, 0, sizeof(ov8820_data)); ov8820_data.mclk = 24000000; /* 6 - 54 MHz, typical 24MHz */ ov8820_data.mclk = plat_data->mclk; + ov8820_data.mclk_source = plat_data->mclk_source; ov8820_data.csi = plat_data->csi; ov8820_data.i2c_client = client; |