diff options
| author | Sheng Nan <b38800@freescale.com> | 2012-10-12 17:21:17 +0800 |
|---|---|---|
| committer | Liu Ying <Ying.Liu@freescale.com> | 2012-10-16 17:40:15 +0800 |
| commit | 520945939eb1bee665f16e5fb84ce3cde0512354 (patch) | |
| tree | 9bbf58b6eb5f0492fe340c1cf738dd5918c70bb8 /drivers | |
| parent | 8e8144b205136bd224a23a3c6749e022dbb8f13e (diff) | |
ENGR00229353 Capture: ov5640 mipi: XVLK rename and value change
- XVCLK equals MCLK/10000, currently XVCLK is hard set as 2200
- rename it in lower case
Signed-off-by: Sheng Nan <b38800@freescale.com>
(cherry picked from commit baca2279464019b44521e0a179d191ecb3a4eb6a)
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/video/mxc/capture/ov5640_mipi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/mxc/capture/ov5640_mipi.c b/drivers/media/video/mxc/capture/ov5640_mipi.c index d5f0773109ac..1b48d9cdb4c9 100644 --- a/drivers/media/video/mxc/capture/ov5640_mipi.c +++ b/drivers/media/video/mxc/capture/ov5640_mipi.c @@ -707,7 +707,6 @@ static s32 ov5640_read_reg(u16 reg, u8 *val) static int prev_sysclk, prev_HTS; static int AE_low, AE_high, AE_Target = 52; -static int XVCLK = 2200; void OV5640_stream_on(void) { @@ -723,6 +722,7 @@ void OV5640_stream_off(void) int OV5640_get_sysclk(void) { /* calculate sysclk */ + int xvclk = ov5640_data.mclk / 10000; int temp1, temp2; int Multiplier, PreDiv, VCO, SysDiv, Pll_rdiv, Bit_div2x = 1, sclk_rdiv, sysclk; u8 temp; @@ -752,7 +752,7 @@ int OV5640_get_sysclk(void) temp2 = temp1 & 0x03; sclk_rdiv = sclk_rdiv_map[temp2]; - VCO = XVCLK * Multiplier / PreDiv; + VCO = xvclk * Multiplier / PreDiv; sysclk = VCO / SysDiv / Pll_rdiv * 2 / Bit_div2x / sclk_rdiv; |