Revert "clk: core: Honor CLK_OPS_PARENT_ENABLE for clk gate ops"

[ Upstream commit abb5f3f4b1f5f0ad50eb067a00051d3587dec9fb ]

This reverts commit 35b0fac808b95eea1212f8860baf6ad25b88b087. Alexander
reports that it causes boot failures on i.MX8M Plus based boards
(specifically imx8mp-tqma8mpql-mba8mpxl.dts).

Reported-by: Alexander Stein <alexander.stein@ew.tq-group.com>
Cc: Chen-Yu Tsai <wenst@chromium.org>
Fixes: 35b0fac808b9 ("clk: core: Honor CLK_OPS_PARENT_ENABLE for clk gate ops")
Link: https://lore.kernel.org/r/12115951.O9o76ZdvQC@steina-w
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
Link: https://lore.kernel.org/r/20220831175326.2523912-1-sboyd@kernel.org
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 4021c7c10c8d9608d2892c70fc0063ad7dadf24f..32606d1094fe4ecaacf507ac1de41d8916f4a9c2 100644 (file)
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -196,9 +196,6 @@ static bool clk_core_rate_is_protected(struct clk_core *core)
        return core->protect_count;
 }
 
-static int clk_core_prepare_enable(struct clk_core *core);
-static void clk_core_disable_unprepare(struct clk_core *core);
-
 static bool clk_core_is_prepared(struct clk_core *core)
 {
        bool ret = false;
@@ -211,11 +208,7 @@ static bool clk_core_is_prepared(struct clk_core *core)
                return core->prepare_count;
 
        if (!clk_pm_runtime_get(core)) {
-               if (core->flags & CLK_OPS_PARENT_ENABLE)
-                       clk_core_prepare_enable(core->parent);
                ret = core->ops->is_prepared(core->hw);
-               if (core->flags & CLK_OPS_PARENT_ENABLE)
-                       clk_core_disable_unprepare(core->parent);
                clk_pm_runtime_put(core);
        }
 
@@ -251,13 +244,7 @@ static bool clk_core_is_enabled(struct clk_core *core)
                }
        }
 
-       if (core->flags & CLK_OPS_PARENT_ENABLE)
-               clk_core_prepare_enable(core->parent);
-
        ret = core->ops->is_enabled(core->hw);
-
-       if (core->flags & CLK_OPS_PARENT_ENABLE)
-               clk_core_disable_unprepare(core->parent);
 done:
        if (core->dev)
                pm_runtime_put(core->dev);
@@ -717,9 +704,6 @@ int clk_rate_exclusive_get(struct clk *clk)
 }
 EXPORT_SYMBOL_GPL(clk_rate_exclusive_get);
 
-static int clk_core_enable_lock(struct clk_core *core);
-static void clk_core_disable_lock(struct clk_core *core);
-
 static void clk_core_unprepare(struct clk_core *core)
 {
        lockdep_assert_held(&prepare_lock);
@@ -743,9 +727,6 @@ static void clk_core_unprepare(struct clk_core *core)
 
        WARN(core->enable_count > 0, "Unpreparing enabled %s\n", core->name);
 
-       if (core->flags & CLK_OPS_PARENT_ENABLE)
-               clk_core_enable_lock(core->parent);
-
        trace_clk_unprepare(core);
 
        if (core->ops->unprepare)
@@ -754,9 +735,6 @@ static void clk_core_unprepare(struct clk_core *core)
        clk_pm_runtime_put(core);
 
        trace_clk_unprepare_complete(core);
-
-       if (core->flags & CLK_OPS_PARENT_ENABLE)
-               clk_core_disable_lock(core->parent);
        clk_core_unprepare(core->parent);
 }
 
@@ -805,9 +783,6 @@ static int clk_core_prepare(struct clk_core *core)
                if (ret)
                        goto runtime_put;
 
-               if (core->flags & CLK_OPS_PARENT_ENABLE)
-                       clk_core_enable_lock(core->parent);
-
                trace_clk_prepare(core);
 
                if (core->ops->prepare)
@@ -815,9 +790,6 @@ static int clk_core_prepare(struct clk_core *core)
 
                trace_clk_prepare_complete(core);
 
-               if (core->flags & CLK_OPS_PARENT_ENABLE)
-                       clk_core_disable_lock(core->parent);
-
                if (ret)
                        goto unprepare;
        }