openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

media: marvell-ccic: power up the device on mclk enable 

Writing to REG_CLKCTRL with the power off causes a hang. Enable the
device first.

Cc: stable@vger.kernel.org # 5.10+
Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Lubomir Rintel 2021-01-27 19:01:43 +01:00 committed by Mauro Carvalho Chehab
parent 918b866edf
commit 655ae29da7
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/platform/marvell-ccic/mcam-core.c
View File

@ -931,6 +931,7 @@ static int mclk_enable(struct clk_hw *hw)
mclk_div = 2; mclk_div = 2;
} }
pm_runtime_get_sync(cam->dev);
clk_enable(cam->clk[0]); clk_enable(cam->clk[0]);
mcam_reg_write(cam, REG_CLKCTRL, (mclk_src << 29) | mclk_div); mcam_reg_write(cam, REG_CLKCTRL, (mclk_src << 29) | mclk_div);
mcam_ctlr_power_up(cam); mcam_ctlr_power_up(cam);
@ -944,6 +945,7 @@ static void mclk_disable(struct clk_hw *hw)
mcam_ctlr_power_down(cam); mcam_ctlr_power_down(cam);
clk_disable(cam->clk[0]); clk_disable(cam->clk[0]);
pm_runtime_put(cam->dev);
} }
static unsigned long mclk_recalc_rate(struct clk_hw *hw, static unsigned long mclk_recalc_rate(struct clk_hw *hw,