diff mbox series

[git:media_tree/master] media: marvell-ccic: power up the device on mclk enable

Message ID E1l8JBT-00Ec3F-QG@www.linuxtv.org
State Accepted
Commit 655ae29da72a693cf294bba3c3322e662ff75bd3
Headers show
Series [git:media_tree/master] media: marvell-ccic: power up the device on mclk enable | expand

Commit Message

Mauro Carvalho Chehab Feb. 6, 2021, 8:31 a.m. UTC 
This is an automatic generated email to let you know that the following patch were queued:

Subject: media: marvell-ccic: power up the device on mclk enable
Author:  Lubomir Rintel <lkundrak@v3.sk>
Date:    Wed Jan 27 19:01:43 2021 +0100

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>

 drivers/media/platform/marvell-ccic/mcam-core.c | 2 ++
 1 file changed, 2 insertions(+)

---
diff mbox series

Patch

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,