From: root <root@zyc-desktop.(none)>
Date: Wed, 1 Aug 2012 04:56:16 +0000 (+0800)
Subject: rk30 camera: disable 24M mclk, version update to 0.2.e.
X-Git-Tag: firefly_0821_release~8941
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5a37c42ad377be8da380b2fdeb5da2103c16704c;p=firefly-linux-kernel-4.4.55.git

rk30 camera: disable 24M mclk, version update to 0.2.e.
---

diff --git a/drivers/media/video/rk30_camera_oneframe.c b/drivers/media/video/rk30_camera_oneframe.c
index 1d5e368d540d..7bdcfb27b93b 100755
--- a/drivers/media/video/rk30_camera_oneframe.c
+++ b/drivers/media/video/rk30_camera_oneframe.c
@@ -211,7 +211,7 @@ module_param(debug, int, S_IRUGO|S_IWUSR);
           2. irq process is splitted to two step.
 *v0.x.e: fix bugs of early suspend when display_pd is closed.          
 */
-#define RK_CAM_VERSION_CODE KERNEL_VERSION(0, 2, 0xc)
+#define RK_CAM_VERSION_CODE KERNEL_VERSION(0, 2, 0xe)
 
 /* limit to rk29 hardware capabilities */
 #define RK_CAM_BUS_PARAM   (SOCAM_MASTER |\
@@ -924,7 +924,12 @@ static void rk_camera_deactivate(struct rk_camera_dev *pcdev)
 
 	clk_disable(pcdev->hclk_cif);
 	clk_disable(pcdev->cif_clk_in);
+	
+	clk_disable(pcdev->cif_clk_out);
+	clk_enable(pcdev->cif_clk_out);
+    clk_set_rate(pcdev->cif_clk_out,48*1000*1000);
 	clk_disable(pcdev->cif_clk_out);
+    
 	clk_disable(pcdev->pd_cif);
     return;
 }