From 97fd4333a82b0f169843b6fee0f37651658adfff Mon Sep 17 00:00:00 2001 From: Chaoqing Xu Date: Mon, 25 Feb 2019 18:14:35 +0800 Subject: [PATCH] camera: rockchip: camsys_drv: fix clk_out can't be closed Change-Id: I19ac05c11d2ffa61f686cef543af7417b877201c Signed-off-by: Chaoqing Xu --- drivers/media/video/rk_camsys/camsys_marvin.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/media/video/rk_camsys/camsys_marvin.c b/drivers/media/video/rk_camsys/camsys_marvin.c index a8860fc6a0f3..cc525e69707c 100644 --- a/drivers/media/video/rk_camsys/camsys_marvin.c +++ b/drivers/media/video/rk_camsys/camsys_marvin.c @@ -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));