Ksawlii/kernel_samsung_a53x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

media: cedrus: Fix clock/reset sequence

Browse source 
[ Upstream commit 36fe515c1a3cd5eac148e8a591a82108d92d5522 ]

According to H6 user manual, resets should always be de-asserted before
clocks are enabled. This is also consistent with vendor driver.

Fixes: d5aecd289bab ("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:
Jernej Skrabec 2023-09-11 20:46:12 +02:00 • committed by Ksawlii
parent 72c342069e
commit 6de52380c3
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
drivers/staging/media/sunxi/cedrus/cedrus_hw.c
View file

@ -145,12 +145,12 @@ int cedrus_hw_suspend(struct device *device)
{ {
struct cedrus_dev *dev = dev_get_drvdata(device); struct cedrus_dev *dev = dev_get_drvdata(device);
reset_control_assert(dev->rstc);
clk_disable_unprepare(dev->ram_clk); clk_disable_unprepare(dev->ram_clk);
clk_disable_unprepare(dev->mod_clk); clk_disable_unprepare(dev->mod_clk);
clk_disable_unprepare(dev->ahb_clk); clk_disable_unprepare(dev->ahb_clk);
reset_control_assert(dev->rstc);
return 0; return 0;
} }
@ -159,11 +159,18 @@ int cedrus_hw_resume(struct device *device)
struct cedrus_dev *dev = dev_get_drvdata(device); struct cedrus_dev *dev = dev_get_drvdata(device);
int ret; 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); ret = clk_prepare_enable(dev->ahb_clk);
if (ret) { if (ret) {
dev_err(dev->dev, "Failed to enable AHB clock\n"); dev_err(dev->dev, "Failed to enable AHB clock\n");
return ret; goto err_rst;
} }
ret = clk_prepare_enable(dev->mod_clk); ret = clk_prepare_enable(dev->mod_clk);
@ -180,21 +187,14 @@ int cedrus_hw_resume(struct device *device)
goto err_mod_clk; 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; return 0;
err_ram_clk:
clk_disable_unprepare(dev->ram_clk);
err_mod_clk: err_mod_clk:
clk_disable_unprepare(dev->mod_clk); clk_disable_unprepare(dev->mod_clk);
err_ahb_clk: err_ahb_clk:
clk_disable_unprepare(dev->ahb_clk); clk_disable_unprepare(dev->ahb_clk);
err_rst:
reset_control_assert(dev->rstc);
return ret; return ret;
} }