From: Sheng Nan <b38800@freescale.com>
Date: Fri, 12 Oct 2012 09:21:17 +0000 (+0800)
Subject: ENGR00229353 Capture: ov5640 mipi: XVLK rename and value change
X-Git-Tag: v3.0.35-fsl~367
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ee21dd232dfdacba6d97b5fd2523f8e20b2c31cd;p=karo-tx-linux.git

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>
---

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;