Re: [PATCH v5 3/4] dmaengine: fsl-edma: convert DMAMUX clock handling to bulk clock API

[Frank Li]

On Wed, May 13, 2026 at 07:23:49PM +0800, Joy Zou wrote:
> Convert the DMAMUX clock management from individual clock operations
> to the bulk clock API to simplify the code.
>
> Prepare to add edma engine runtime pm support.
>
> Signed-off-by: Joy Zou <joy.zou@xxxxxxx>
> ---

Reviewed-by: Frank Li <Frank.Li@xxxxxxx>

>  drivers/dma/fsl-edma-common.h |  2 +-
>  drivers/dma/fsl-edma-main.c   | 43 ++++++++++++++++++++-----------------------
>  2 files changed, 21 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/dma/fsl-edma-common.h b/drivers/dma/fsl-edma-common.h
> index 54128b3f45cb399e1c11d9f86d64adce5c65c102..824b7dd2b52618b826154e55fb96a82c27e846ee 100644
> --- a/drivers/dma/fsl-edma-common.h
> +++ b/drivers/dma/fsl-edma-common.h
> @@ -253,7 +253,7 @@ struct fsl_edma_engine {
>  	struct dma_device	dma_dev;
>  	void __iomem		*membase;
>  	void __iomem		*muxbase[DMAMUX_NR];
> -	struct clk		*muxclk[DMAMUX_NR];
> +	struct clk_bulk_data    *muxclk;
>  	struct clk		*dmaclk;
>  	struct mutex		fsl_edma_mutex;
>  	const struct fsl_edma_drvdata *drvdata;
> diff --git a/drivers/dma/fsl-edma-main.c b/drivers/dma/fsl-edma-main.c
> index ecd14967bfbc07d373a74790e87f9aa36b60e6c9..c12126ea6552d51b773bdd61c018570dbd618602 100644
> --- a/drivers/dma/fsl-edma-main.c
> +++ b/drivers/dma/fsl-edma-main.c
> @@ -526,14 +526,6 @@ static void fsl_edma_irq_exit(
>  	}
>  }
>
> -static void fsl_disable_clocks(struct fsl_edma_engine *fsl_edma, int nr_clocks)
> -{
> -	int i;
> -
> -	for (i = 0; i < nr_clocks; i++)
> -		clk_disable_unprepare(fsl_edma->muxclk[i]);
> -}
> -
>  static struct fsl_edma_drvdata vf610_data = {
>  	.dmamuxs = DMAMUX_NR,
>  	.flags = FSL_EDMA_DRV_WRAP_IO,
> @@ -747,23 +739,28 @@ static int fsl_edma_probe(struct platform_device *pdev)
>  		fsl_edma->chan_masked |= chan_mask[0];
>  	}
>
> -	for (i = 0; i < fsl_edma->drvdata->dmamuxs; i++) {
> -		char clkname[32];
> -
> -		fsl_edma->muxbase[i] = devm_platform_ioremap_resource(pdev,
> -								      1 + i);
> -		if (IS_ERR(fsl_edma->muxbase[i])) {
> -			/* on error: disable all previously enabled clks */
> -			fsl_disable_clocks(fsl_edma, i);
> -			return PTR_ERR(fsl_edma->muxbase[i]);
> +	if (fsl_edma->drvdata->dmamuxs) {
> +		fsl_edma->muxclk = devm_kcalloc(&pdev->dev, fsl_edma->drvdata->dmamuxs,
> +						sizeof(*fsl_edma->muxclk), GFP_KERNEL);
> +		if (!fsl_edma->muxclk)
> +			return -ENOMEM;
> +
> +		for (i = 0; i < fsl_edma->drvdata->dmamuxs; i++) {
> +			fsl_edma->muxbase[i] = devm_platform_ioremap_resource(pdev, 1 + i);
> +			if (IS_ERR(fsl_edma->muxbase[i]))
> +				return PTR_ERR(fsl_edma->muxbase[i]);
> +
> +			fsl_edma->muxclk[i].id = devm_kasprintf(&pdev->dev, GFP_KERNEL,
> +								"dmamux%d", i);
> +			if (!fsl_edma->muxclk[i].id)
> +				return -ENOMEM;
>  		}
>
> -		sprintf(clkname, "dmamux%d", i);
> -		fsl_edma->muxclk[i] = devm_clk_get_enabled(&pdev->dev, clkname);
> -		if (IS_ERR(fsl_edma->muxclk[i]))
> -			return dev_err_probe(&pdev->dev,
> -					     PTR_ERR(fsl_edma->muxclk[i]),
> -					     "Missing DMAMUX block clock.\n");
> +		ret = devm_clk_bulk_get_optional_enable(&pdev->dev, fsl_edma->drvdata->dmamuxs,
> +							fsl_edma->muxclk);
> +		if (ret)
> +			return dev_err_probe(&pdev->dev, ret,
> +					     "Failed to enable DMAMUX block clock.\n");
>  	}
>
>  	fsl_edma->big_endian = of_property_read_bool(np, "big-endian");
>
> --
> 2.37.1
>