Commit 36fe515c authored by Jernej Skrabec's avatar Jernej Skrabec Committed by Hans Verkuil
Browse files

media: cedrus: Fix clock/reset sequence 



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

Fixes: d5aecd28 ("media: cedrus: Implement runtime PM")
Signed-off-by: default avatarJernej Skrabec <jernej.skrabec@gmail.com>
Acked-by: default avatarPaul Kocialkowski <paul.kocialkowski@bootlin.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent 85b901e6

drivers/staging/media/sunxi/cedrus/cedrus_hw.c

+12 −12
Original line number Diff line number Diff line
@@ -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;

}