From: Mathieu Poirier <mathieu.poirier@linaro.org>
To: peng.fan@oss.nxp.com
Cc: ohad@wizery.com, bjorn.andersson@linaro.org,
o.rempel@pengutronix.de, robh+dt@kernel.org,
devicetree@vger.kernel.org, shawnguo@kernel.org,
s.hauer@pengutronix.de, kernel@pengutronix.de,
festevam@gmail.com, linux-remoteproc@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, Peng Fan <peng.fan@nxp.com>
Subject: Re: [PATCH V4 6/8] remoteproc: imx_rproc: make clk optional
Date: Fri, 16 Apr 2021 11:46:22 -0600 [thread overview]
Message-ID: <20210416174622.GC1050209@xps15> (raw)
In-Reply-To: <1618493261-32606-7-git-send-email-peng.fan@oss.nxp.com>
On Thu, Apr 15, 2021 at 09:27:39PM +0800, peng.fan@oss.nxp.com wrote:
> From: Peng Fan <peng.fan@nxp.com>
>
> To i.MX7ULP, M4 is the master to control everything, no need to provide
> clk from Linux side. So make clk optional when method is IMX_RPROC_NONE.
>
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
> ---
> drivers/remoteproc/imx_rproc.c | 46 ++++++++++++++++++++++++++++--------------
> 1 file changed, 31 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c
> index 2b633fd..56dfcc1 100644
> --- a/drivers/remoteproc/imx_rproc.c
> +++ b/drivers/remoteproc/imx_rproc.c
> @@ -606,6 +606,35 @@ static int imx_rproc_detect_mode(struct imx_rproc *priv)
> return 0;
> }
>
> +static int imx_rproc_clk_enable(struct imx_rproc *priv)
> +{
> + const struct imx_rproc_dcfg *dcfg = priv->dcfg;
> + struct device *dev = priv->dev;
> + int ret;
> +
> + /* Remote core is not under control of Linux */
> + if (dcfg->method == IMX_RPROC_NONE)
> + return 0;
> +
> + priv->clk = devm_clk_get(dev, NULL);
> + if (IS_ERR(priv->clk)) {
> + dev_err(dev, "Failed to get clock\n");
> + return PTR_ERR(priv->clk);
> + }
> +
> + /*
> + * clk for M4 block including memory. Should be
> + * enabled before .start for FW transfer.
> + */
> + ret = clk_prepare_enable(priv->clk);
> + if (ret) {
> + dev_err(dev, "Failed to enable clock\n");
> + return ret;
> + }
> +
> + return 0;
> +}
> +
> static int imx_rproc_probe(struct platform_device *pdev)
> {
> struct device *dev = &pdev->dev;
> @@ -654,22 +683,9 @@ static int imx_rproc_probe(struct platform_device *pdev)
> if (ret)
> goto err_put_mbox;
>
> - priv->clk = devm_clk_get(dev, NULL);
> - if (IS_ERR(priv->clk)) {
> - dev_err(dev, "Failed to get clock\n");
> - ret = PTR_ERR(priv->clk);
> - goto err_put_mbox;
> - }
> -
> - /*
> - * clk for M4 block including memory. Should be
> - * enabled before .start for FW transfer.
> - */
> - ret = clk_prepare_enable(priv->clk);
> - if (ret) {
> - dev_err(&rproc->dev, "Failed to enable clock\n");
> + ret = imx_rproc_clk_enable(priv);
> + if (ret)
Much better
Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org>
> goto err_put_mbox;
> - }
>
> INIT_WORK(&priv->rproc_work, imx_rproc_vq_work);
>
> --
> 2.7.4
>
next prev parent reply other threads:[~2021-04-16 17:46 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-15 13:27 [PATCH V4 0/8] remoteproc: imx_rproc: support i.MX7ULP/8MN/8MP peng.fan
2021-04-15 13:27 ` [PATCH V4 1/8] dt-bindings: remoteproc: imx_rproc: add fsl,auto-boot property peng.fan
2021-04-15 13:27 ` [PATCH V4 2/8] dt-bindings: remoteproc: imx_rproc: add i.MX7ULP support peng.fan
2021-04-15 13:27 ` [PATCH V4 3/8] dt-bindings: remoteproc: imx_rproc: support i.MX8MN/P peng.fan
2021-04-15 13:27 ` [PATCH V4 4/8] remoteproc: imx_rproc: parse fsl,auto-boot peng.fan
2021-04-16 17:41 ` Mathieu Poirier
2021-04-15 13:27 ` [PATCH V4 5/8] remoteproc: imx_rproc: initial support for mutilple start/stop method peng.fan
2021-04-16 17:44 ` Mathieu Poirier
2021-04-15 13:27 ` [PATCH V4 6/8] remoteproc: imx_rproc: make clk optional peng.fan
2021-04-16 17:46 ` Mathieu Poirier [this message]
2021-04-15 13:27 ` [PATCH V4 7/8] remoteproc: imx_rproc: support i.MX7ULP peng.fan
2021-04-16 17:47 ` Mathieu Poirier
2021-04-15 13:27 ` [PATCH V4 8/8] remoteproc: imx_rproc: support i.MX8MN/P peng.fan
2021-04-16 17:58 ` [PATCH V4 0/8] remoteproc: imx_rproc: support i.MX7ULP/8MN/8MP Mathieu Poirier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210416174622.GC1050209@xps15 \
--to=mathieu.poirier@linaro.org \
--cc=bjorn.andersson@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=festevam@gmail.com \
--cc=kernel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-remoteproc@vger.kernel.org \
--cc=o.rempel@pengutronix.de \
--cc=ohad@wizery.com \
--cc=peng.fan@nxp.com \
--cc=peng.fan@oss.nxp.com \
--cc=robh+dt@kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=shawnguo@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).