clk: imx: composite-93: keep root clock on when mcore enabled

Previously we assumed that the root clock slice is enabled
by default when kernel boot up. But the bootloader may disable
the clocks before jump into kernel. The gate ops should be registered
rather than NULL to make sure the disabled clock can be enabled
when kernel boot up.  Refine the code to skip disable the clock
if mcore booted.

Fixes: a740d7350ff7 ("clk: imx: imx93: add mcore_booted module paratemter")
Signed-off-by: Jacky Bai <ping.bai@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
Tested-by: Chancel Liu <chancel.liu@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Abel Vesa <abel.vesa@linaro.org>
Link: https://lore.kernel.org/r/20240607133347.3291040-3-peng.fan@oss.nxp.com
Signed-off-by: Abel Vesa <abel.vesa@linaro.org>

diff --git a/drivers/clk/imx/clk-composite-93.c b/drivers/clk/imx/clk-composite-93.c
index 81164bdcd6cc9afa55e6e92756270b4cfcf62207..6c6c5a30f3282d4d128751147714bf24b64c52f3 100644 (file)
--- a/drivers/clk/imx/clk-composite-93.c
+++ b/drivers/clk/imx/clk-composite-93.c
@@ -76,6 +76,13 @@ static int imx93_clk_composite_gate_enable(struct clk_hw *hw)
 
 static void imx93_clk_composite_gate_disable(struct clk_hw *hw)
 {
+       /*
+        * Skip disable the root clock gate if mcore enabled.
+        * The root clock may be used by the mcore.
+        */
+       if (mcore_booted)
+               return;
+
        imx93_clk_composite_gate_endisable(hw, 0);
 }
 
@@ -222,7 +229,7 @@ struct clk_hw *imx93_clk_composite_flags(const char *name, const char * const *p
                hw = clk_hw_register_composite(NULL, name, parent_names, num_parents,
                                               mux_hw, &clk_mux_ro_ops, div_hw,
                                               &clk_divider_ro_ops, NULL, NULL, flags);
-       } else if (!mcore_booted) {
+       } else {
                gate = kzalloc(sizeof(*gate), GFP_KERNEL);
                if (!gate)
                        goto fail;
@@ -238,12 +245,6 @@ struct clk_hw *imx93_clk_composite_flags(const char *name, const char * const *p
                                               &imx93_clk_composite_divider_ops, gate_hw,
                                               &imx93_clk_composite_gate_ops,
                                               flags | CLK_SET_RATE_NO_REPARENT);
-       } else {
-               hw = clk_hw_register_composite(NULL, name, parent_names, num_parents,
-                                              mux_hw, &imx93_clk_composite_mux_ops, div_hw,
-                                              &imx93_clk_composite_divider_ops, NULL,
-                                              &imx93_clk_composite_gate_ops,
-                                              flags | CLK_SET_RATE_NO_REPARENT);
        }
 
        if (IS_ERR(hw))