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

camera: rockchip: camsys_drv: fix clk_out can't be closed

Browse Source 
Change-Id: I19ac05c11d2ffa61f686cef543af7417b877201c
Signed-off-by: Chaoqing Xu <shawn.xu@rock-chips.com>
This commit is contained in:
Chaoqing Xu
2019-02-25 18:14:35 +08:00
committed by Tao Huang
parent 7229af9d0c
commit 97fd4333a8
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/media/video/rk_camsys/camsys_marvin.c
View File

@@ -566,7 +566,6 @@ static int camsys_mrv_clkin_cb(void *ptr, unsigned int on)
clk_prepare_enable(clk->pclk_dphytxrx);
clk_prepare_enable(clk->pclkin_isp);
clk_prepare_enable(clk->cif_clk_out);
} else {
clk_set_rate(clk->clk_isp0, isp_clk);
clk_prepare_enable(clk->hclk_isp0_noc);
@@ -699,8 +698,8 @@ static int camsys_mrv_clkout_cb(void *ptr, unsigned int on, unsigned int inclk)
inclk);
} else if (!on && clk->out_on) {
if (!IS_ERR_OR_NULL(clk->cif_clk_pll)) {
clk_set_parent(clk->cif_clk_out,
clk->cif_clk_pll);
/* just for closing clk which base on XIN24M */
clk_set_rate(clk->cif_clk_out, 36000000);
} else {
camsys_warn("%s clock out may be not off!",
dev_name(camsys_dev->miscdev.this_device));