Commit cc0316c1 authored by Peng Fan's avatar Peng Fan Committed by Bjorn Andersson
Browse files

remoteproc: imx_rproc: make clk optional 



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: default avatarPeng Fan <peng.fan@nxp.com>
Reviewed-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
Link: https://lore.kernel.org/r/1620274123-1461-7-git-send-email-peng.fan@oss.nxp.com


Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
parent 52bda8d3

drivers/remoteproc/imx_rproc.c

+31 −15
Original line number Diff line number Diff line
@@ -590,6 +590,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;
@@ -648,22 +677,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)

		goto err_put_mbox;

	}



	INIT_WORK(&priv->rproc_work, imx_rproc_vq_work);