mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-21 10:01:00 +00:00
media: cedrus: Fix clock/reset sequence
[ Upstream commit36fe515c1a
] According to H6 user manual, resets should always be de-asserted before clocks are enabled. This is also consistent with vendor driver. Fixes:d5aecd289b
("media: cedrus: Implement runtime PM") Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com> Acked-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
aae7598aff
commit
c88a8a09c0
1 changed files with 12 additions and 12 deletions
|
@ -172,12 +172,12 @@ int cedrus_hw_suspend(struct device *device)
|
|||
{
|
||||
struct cedrus_dev *dev = dev_get_drvdata(device);
|
||||
|
||||
reset_control_assert(dev->rstc);
|
||||
|
||||
clk_disable_unprepare(dev->ram_clk);
|
||||
clk_disable_unprepare(dev->mod_clk);
|
||||
clk_disable_unprepare(dev->ahb_clk);
|
||||
|
||||
reset_control_assert(dev->rstc);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -186,11 +186,18 @@ int cedrus_hw_resume(struct device *device)
|
|||
struct cedrus_dev *dev = dev_get_drvdata(device);
|
||||
int ret;
|
||||
|
||||
ret = reset_control_reset(dev->rstc);
|
||||
if (ret) {
|
||||
dev_err(dev->dev, "Failed to apply reset\n");
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
ret = clk_prepare_enable(dev->ahb_clk);
|
||||
if (ret) {
|
||||
dev_err(dev->dev, "Failed to enable AHB clock\n");
|
||||
|
||||
return ret;
|
||||
goto err_rst;
|
||||
}
|
||||
|
||||
ret = clk_prepare_enable(dev->mod_clk);
|
||||
|
@ -207,21 +214,14 @@ int cedrus_hw_resume(struct device *device)
|
|||
goto err_mod_clk;
|
||||
}
|
||||
|
||||
ret = reset_control_reset(dev->rstc);
|
||||
if (ret) {
|
||||
dev_err(dev->dev, "Failed to apply reset\n");
|
||||
|
||||
goto err_ram_clk;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
err_ram_clk:
|
||||
clk_disable_unprepare(dev->ram_clk);
|
||||
err_mod_clk:
|
||||
clk_disable_unprepare(dev->mod_clk);
|
||||
err_ahb_clk:
|
||||
clk_disable_unprepare(dev->ahb_clk);
|
||||
err_rst:
|
||||
reset_control_assert(dev->rstc);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue