remoteproc: imx_rproc: Simplify clock enable logic using dcfg flags

Simplify the clock enable logic by removing the dedicated
imx_rproc_clk_enable() function and integrate the clock handling directly
into the probe function to simplify the code.

Add a new IMX_RPROC_NEED_CLKS flag in dcfg to indicate whether clock
management is required for a given SoC. Update probe logic to conditionally
enable clocks based on the new flag.

Set the flag for applicable SoCs (e.g., i.MX7D, i.MX8MQ, i.MX93, etc.).

No functional changes.

Reviewed-by: Frank Li <Frank.Li@nxp.com>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Link: https://lore.kernel.org/r/20251024-imx_rproc_c4-v4-1-af83ed3fdbba@nxp.com
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>

diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c
index 68e01b647b66910627fb2256c96c152f3c22c83b..2a71863c09e917719301e02c3cd535a2852abbea 100644 (file)
--- a/drivers/remoteproc/imx_rproc.c
+++ b/drivers/remoteproc/imx_rproc.c
@@ -1002,28 +1002,6 @@ static int imx_rproc_detect_mode(struct imx_rproc *priv)
        return dcfg->ops->detect_mode(priv->rproc);
 }
 
-static int imx_rproc_clk_enable(struct imx_rproc *priv)
-{
-       const struct imx_rproc_dcfg *dcfg = priv->dcfg;
-       struct device *dev = priv->dev;
-
-       /* Remote core is not under control of Linux or it is managed by SCU API */
-       if (dcfg->method == IMX_RPROC_NONE || dcfg->method == IMX_RPROC_SCU_API)
-               return 0;
-
-       /*
-        * clk for M4 block including memory. Should be
-        * enabled before .start for FW transfer.
-        */
-       priv->clk = devm_clk_get_enabled(dev, NULL);
-       if (IS_ERR(priv->clk)) {
-               dev_err(dev, "Failed to enable clock\n");
-               return PTR_ERR(priv->clk);
-       }
-
-       return 0;
-}
-
 static int imx_rproc_sys_off_handler(struct sys_off_data *data)
 {
        struct rproc *rproc = data->cb_data;
@@ -1101,9 +1079,15 @@ static int imx_rproc_probe(struct platform_device *pdev)
        if (ret)
                return dev_err_probe(dev, ret, "failed on detect mode\n");
 
-       ret = imx_rproc_clk_enable(priv);
-       if (ret)
-               return dev_err_probe(dev, ret, "failed to enable clks\n");
+       /*
+        * Handle clocks when remote core is under control of Linux AND the
+        * clocks are not managed by system firmware.
+        */
+       if (dcfg->flags & IMX_RPROC_NEED_CLKS) {
+               priv->clk = devm_clk_get_enabled(dev, NULL);
+               if (IS_ERR(priv->clk))
+                       return dev_err_probe(dev, PTR_ERR(priv->clk), "Failed to enable clock\n");
+       }
 
        if (rproc->state != RPROC_DETACHED)
                rproc->auto_boot = of_property_read_bool(np, "fsl,auto-boot");
@@ -1192,6 +1176,7 @@ static const struct imx_rproc_dcfg imx_rproc_cfg_imx8mn_mmio = {
        .att_size       = ARRAY_SIZE(imx_rproc_att_imx8mn),
        .method         = IMX_RPROC_MMIO,
        .ops            = &imx_rproc_ops_mmio,
+       .flags          = IMX_RPROC_NEED_CLKS,
 };
 
 static const struct imx_rproc_dcfg imx_rproc_cfg_imx8mn = {
@@ -1199,6 +1184,7 @@ static const struct imx_rproc_dcfg imx_rproc_cfg_imx8mn = {
        .att_size       = ARRAY_SIZE(imx_rproc_att_imx8mn),
        .method         = IMX_RPROC_SMC,
        .ops            = &imx_rproc_ops_arm_smc,
+       .flags          = IMX_RPROC_NEED_CLKS,
 };
 
 static const struct imx_rproc_dcfg imx_rproc_cfg_imx8mq = {
@@ -1210,6 +1196,7 @@ static const struct imx_rproc_dcfg imx_rproc_cfg_imx8mq = {
        .att_size       = ARRAY_SIZE(imx_rproc_att_imx8mq),
        .method         = IMX_RPROC_MMIO,
        .ops            = &imx_rproc_ops_mmio,
+       .flags          = IMX_RPROC_NEED_CLKS,
 };
 
 static const struct imx_rproc_dcfg imx_rproc_cfg_imx8qm = {
@@ -1248,6 +1235,7 @@ static const struct imx_rproc_dcfg imx_rproc_cfg_imx7d = {
        .att_size       = ARRAY_SIZE(imx_rproc_att_imx7d),
        .method         = IMX_RPROC_MMIO,
        .ops            = &imx_rproc_ops_mmio,
+       .flags          = IMX_RPROC_NEED_CLKS,
 };
 
 static const struct imx_rproc_dcfg imx_rproc_cfg_imx6sx = {
@@ -1259,6 +1247,7 @@ static const struct imx_rproc_dcfg imx_rproc_cfg_imx6sx = {
        .att_size       = ARRAY_SIZE(imx_rproc_att_imx6sx),
        .method         = IMX_RPROC_MMIO,
        .ops            = &imx_rproc_ops_mmio,
+       .flags          = IMX_RPROC_NEED_CLKS,
 };
 
 static const struct imx_rproc_dcfg imx_rproc_cfg_imx93 = {
@@ -1266,6 +1255,7 @@ static const struct imx_rproc_dcfg imx_rproc_cfg_imx93 = {
        .att_size       = ARRAY_SIZE(imx_rproc_att_imx93),
        .method         = IMX_RPROC_SMC,
        .ops            = &imx_rproc_ops_arm_smc,
+       .flags          = IMX_RPROC_NEED_CLKS,
 };
 
 static const struct of_device_id imx_rproc_of_match[] = {

diff --git a/drivers/remoteproc/imx_rproc.h b/drivers/remoteproc/imx_rproc.h
index 3a9adaaf048b396102feeb45488cd2ff125a807a..a9cba623560c85ea37e47401c392c06dada500aa 100644 (file)
--- a/drivers/remoteproc/imx_rproc.h
+++ b/drivers/remoteproc/imx_rproc.h
@@ -30,6 +30,7 @@ enum imx_rproc_method {
 
 /* dcfg flags */
 #define IMX_RPROC_NEED_SYSTEM_OFF      BIT(0)
+#define IMX_RPROC_NEED_CLKS            BIT(1)
 
 struct imx_rproc_plat_ops {
        int (*start)(struct rproc *rproc);