media: cedrus: Fix clock/reset sequence

[ 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>

diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_hw.c b/drivers/staging/media/sunxi/cedrus/cedrus_hw.c
index b696bf884cbd69ebafe9490ae63a5a7834ea3d07..32af0e96e762b490dd9560a8ab4530e0991f593a 100644 (file)
--- a/drivers/staging/media/sunxi/cedrus/cedrus_hw.c
+++ b/drivers/staging/media/sunxi/cedrus/cedrus_hw.c
@@ -172,12 +172,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->mod_clk);
        clk_disable_unprepare(dev->ahb_clk);
 
        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;
 }
 
        return 0;
 }
 


@@ -186,11 +186,18 @@ int cedrus_hw_resume(struct device *device)
        struct cedrus_dev *dev = dev_get_drvdata(device);
        int ret;
 
        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");
 
        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);
        }
 
        ret = clk_prepare_enable(dev->mod_clk);


@@ -207,21 +214,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:
        clk_disable_unprepare(dev->mod_clk);
 err_ahb_clk:
        clk_disable_unprepare(dev->ahb_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;
 }
 
        return ret;
 }