rk30 camera: disable 24M mclk, version update to 0.2.e.
authorroot <root@zyc-desktop.(none)>
Wed, 1 Aug 2012 04:56:16 +0000 (12:56 +0800)
committerroot <root@zyc-desktop.(none)>
Wed, 1 Aug 2012 04:57:38 +0000 (12:57 +0800)
drivers/media/video/rk30_camera_oneframe.c

index 1d5e368d540d249a00325c7591ef470c589d157a..7bdcfb27b93b79b72a3b27a5ab72a1601f191ee5 100755 (executable)
@@ -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;
 }