shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 04:10:18 +09:00
Code Issues Packages Projects Releases Wiki Activity

camera: close cif_clk_out not denpend on modify clock name.

Browse Source
This commit is contained in:
oyyf
2013-08-15 10:51:46 +08:00
parent 01c8382530
commit 474b8dab46
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/media/video/rk30_camera_oneframe.c
View File

@@ -1441,6 +1441,7 @@ static int rk_camera_mclk_ctrl(int cif_idx, int on, int clk_rate)
{
int err = 0,cif;
struct rk_cif_clk *clk;
struct clk *cif_clk_out_div;
cif = cif_idx - RK29_CAM_PLATFORM_DEV_ID;
if ((cif<0)||(cif>1)) {
@@ -1474,10 +1475,17 @@ static int rk_camera_mclk_ctrl(int cif_idx, int on, int clk_rate)
clk_disable(clk->pd_cif);
clk->on = false;
if(cif){
err = clk_set_parent(clk->cif_clk_out, clk_get(NULL, "cif1_out_div"));
cif_clk_out_div = clk_get(NULL, "cif1_out_div");
err = clk_set_parent(clk->cif_clk_out,cif_clk_out_div);
}else{
err = clk_set_parent(clk->cif_clk_out, clk_get(NULL, "cif0_out_div"));
cif_clk_out_div = clk_get(NULL, "cif0_out_div");
if(IS_ERR_OR_NULL(cif_clk_out_div)){
cif_clk_out_div = clk_get(NULL, "cif_out_div");
}
err = clk_set_parent(clk->cif_clk_out, cif_clk_out_div);
}
if(err)
RKCAMERA_TR("WARNING %s_%s_%d: camera sensor mclk maybe not close, please check!!!\n", __FILE__, __FUNCTION__, __LINE__);
}
spin_unlock(&clk->lock);
rk_camera_clk_ctrl_end: