diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2021-01-27 19:01:43 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2021-02-06 09:31:03 +0100 |
| commit | 655ae29da72a693cf294bba3c3322e662ff75bd3 (patch) | |
| tree | 365bbffbe59d527903f47976c99a3adf542d5a57 /drivers/media | |
| parent | 918b866edfec39e22ccb9528bc11a0dd6ca62c2b (diff) | |
| download | lwn-655ae29da72a693cf294bba3c3322e662ff75bd3.tar.gz lwn-655ae29da72a693cf294bba3c3322e662ff75bd3.zip | |
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>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/platform/marvell-ccic/mcam-core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/platform/marvell-ccic/mcam-core.c b/drivers/media/platform/marvell-ccic/mcam-core.c index 153277e4fe80..141bf5d97a04 100644 --- a/drivers/media/platform/marvell-ccic/mcam-core.c +++ b/drivers/media/platform/marvell-ccic/mcam-core.c @@ -931,6 +931,7 @@ static int mclk_enable(struct clk_hw *hw) mclk_div = 2; } + pm_runtime_get_sync(cam->dev); clk_enable(cam->clk[0]); mcam_reg_write(cam, REG_CLKCTRL, (mclk_src << 29) | mclk_div); mcam_ctlr_power_up(cam); @@ -944,6 +945,7 @@ static void mclk_disable(struct clk_hw *hw) mcam_ctlr_power_down(cam); clk_disable(cam->clk[0]); + pm_runtime_put(cam->dev); } static unsigned long mclk_recalc_rate(struct clk_hw *hw, |