Received-SPF: pass (google.com: domain of linux-kernel+bounces-83709-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
From: Frank Li <Frank.Li@nxp.com>
Date: Tue, 27 Feb 2024 12:21:57 -0500
Subject: [PATCH 5/5] dmaengine: fsl-edma: add i.MX8ULP edma support
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20240227-8ulp_edma-v1-5-7fcfe1e265c2@nxp.com>
References: <20240227-8ulp_edma-v1-0-7fcfe1e265c2@nxp.com>
In-Reply-To: <20240227-8ulp_edma-v1-0-7fcfe1e265c2@nxp.com>
To: Vinod Koul <vkoul@kernel.org>, Rob Herring <robh@kernel.org>, 
 Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>, 
 Conor Dooley <conor+dt@kernel.org>, Peng Fan <peng.fan@nxp.com>
Cc: imx@lists.linux.dev, dmaengine@vger.kernel.org, 
 linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, 
 Frank Li <Frank.Li@nxp.com>, Joy Zou <joy.zou@nxp.com>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?utf-8?B?cFNDTWlKUjhIZ1ExUlBjMzV5V1F3WC80TFkzcmJLK2ZrcStTZzJLN1NIOVh0?=
 =?utf-8?B?dWQ4TWdrOWo4SzYzT0ZQNCtXVUU1emg0TDFJTFMzeVA4QzdHdTlWbnFzTWxK?=
 =?utf-8?B?UGltWGxIcHMxQW1aZDZKWnZScit5azcvOGtOdlg0NGNla2dxWEllSXhPVWF3?=
 =?utf-8?B?NEZsWlhLSkVZd05rNVpEaE9jajRJSktOTUtLRWJuQWFEUjhuSGgzVktVOUQz?=
 =?utf-8?B?MWdhemtkZXQyOXp4R055dVVBMW14NjA5VitvY3llRTdaK2Y3aHo2cEJ2aUlJ?=
 =?utf-8?B?d3FiNk1yZ1RkOUVMMWQ3MGsxbkx2SjZ3Z01aMkJiOVd3ZWtWdGtVMjJuc2Zo?=
 =?utf-8?B?cUZ0NE1FQlgxbzRER3dxSndPYkdHdjY4Y0lNcy9ZTDVsNVdpTFdvc25LbW5C?=
 =?utf-8?B?eFRMeWlFSWJPWUx0SHdPSFI2Wmc4ZWo0Q0gyVzNqTFArNmRMazdudS9qZDM0?=
 =?utf-8?B?ZU96ZDZoRWtvdkdDYWMxOTQ2ZW1oSjdLTGNONXhCK2ZTZlFqWFJqOEJKTmVZ?=
 =?utf-8?B?Ymt3M0lQQkdMTFJVSDdjTFVXbWcrRHhZM1VXRWp5eGlPUVV1aDVFWDUyRmJk?=
 =?utf-8?B?eU9KV0Y2RStuUm5IbkZOVU5tVXZBb040WXNqVmNxTmJSamo5emNlYnhaekdX?=
 =?utf-8?B?R3pwTnNzRmlSM2h6M2F2d3RSNWdJZXhXNXhQd2E1MHNyOXptT0QxbEx3Z1Bs?=
 =?utf-8?B?Z1NTVmYxSHBoOGtzaEtBVzFKclBLY2JMelpNUm9JaFJLMTBNM1FLWThITzRV?=
 =?utf-8?B?ZHhvMmdDbzFjUUlKOVJPRk1XbEx2TGh3MnFBTlkyNnB4RzZuMk5vTVJjeDdT?=
 =?utf-8?B?U2VxenJJMk90QXJ2M3MzYWd1K3VQT3FOaHBrUzEwMnQ4eW5hOXd2aDBEdFNZ?=
 =?utf-8?B?L0xNWHc3L2hRYlFrclVuWVRDY0wrcGdRc2dPNUFCSk4xTk5OcE84SzlTd29T?=
 =?utf-8?B?Q1M4YUNOMyttcE1JaE1CdWMyVmZWUTZKRkZMRFdidzRCa0l6TmZIaUJac3BE?=
 =?utf-8?B?ejZmbGpXc3BvNHRwbHU1dVoyejcwQ1Z6Z004eVppbWFJSFI0R2ZhRnpzeFQr?=
 =?utf-8?B?TklIVVFsNkhpZHBDaTVMamFsQk1yeVZ3eUU5WWhJR3h0WHNvaExXU2xpZGYx?=
 =?utf-8?B?dWdnaDhlV1JsZkZDMVlCMFdJMVFScUxoYkUwb1l0dHVteFUySHV1L2IwcVUr?=
 =?utf-8?B?SnhlNjFzM0dxQ1duK29iSlgwOTV6MllzTC9TcDFCT0I2ZlJGZ0tvV2xlTGNI?=
 =?utf-8?B?OXpTNU9iMk4wWC9XQ1N0WFBFR212RVJYZmdYWXJVYkdWSVJMa21VV0VXcVRp?=
 =?utf-8?B?dEt6WUQ3ZzZLbzczZ0dtQWFaMjRBWXRDNis1anpxL0pqQURMMVRCd0ZCVHRw?=
 =?utf-8?B?cG82b0l2bGlIYTh3bWZZMEl0eURidGRNYkJPeERGTVFGR1crUFVVdU9xOEUx?=
 =?utf-8?B?d1ZISFVlOG02WTBQY2ZPS3JIMkgwYlRYN1ZsVGV6YmlFdTh4K2JvcHZTVm1n?=
 =?utf-8?B?ZHZueFJNa25nbWlJei9kRkxLV2lrSWtxbHZOanYwaDYxZmtuTTFWb2E0Rnlv?=
 =?utf-8?B?OUpYUGJ5K3RoQWYwK1dPWDYreCtweVFmTGFLcWRET21LZjJUWVR4SkR2c3VB?=
 =?utf-8?B?NFpHakh4dEx5L01DWkg3dWRZMmRwcXdxNHhWYTJDZUtNM1M0ZndZNExaRkVj?=
 =?utf-8?B?a09CejVHTFM4eUNhWnFWZk12d1ZWWmx2YVAvNUVrbnFLbDMzVWJmTktQQ3hM?=
 =?utf-8?B?UFkvb1VZRlNudGgydnhOYXZJaFBWc010aDdaUkQ2RCtFQStjd0F0Z3BBdzgx?=
 =?utf-8?B?M1N5azVWemtBZXl2dHFIMWlUOEtyaGtlSzJ5S1U2bGJkTk05K2gwbk9rS1p6?=
 =?utf-8?B?bEY5VUwyQURVcWQzMFZpWEtQMGRZMU8yWFo0N1NFWVlOYmI4VGRLZkdVWk1O?=
 =?utf-8?B?Vk9Pb3p6THlMdXNJbUZkZ2JPUmZtRXlCbk9meDFYR0lhNURNY0lKY2dWOGor?=
 =?utf-8?B?ZmdNbytNbU5tRHhKakV3NGZnTC8yU0ZtMVlwMjRpNlczZVRiKzY3VlRPZ29W?=
 =?utf-8?B?N3BsVDZWbzh5UklNclV3MUwzR0hOODF6VDBBT3Z5dk1ocXRUeVdIS1B5bkdh?=
 =?utf-8?Q?0h88dwATJWEfxSX1yPcKtmKDe?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 7b578e85-6f1a-4ec6-165a-08dc37b8ab09
X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2024 17:22:26.3660
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: YXcdlwG3XPSzEWoatWTfzn02cB4fUfQALFLkDFdD93zyJ2m2Y4kD/Ix15CdgRUd4kH/eiV/EAvJpAfebXuFOeg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS1PR04MB9408

From: Joy Zou <joy.zou@nxp.com>

Add support for the i.MX8ULP platform to the eDMA driver. Introduce the use
of the correct FSL_EDMA_DRV_HAS_CHCLK flag to handle per-channel clock
configurations.

Signed-off-by: Joy Zou <joy.zou@nxp.com>
Reviewed-by: Frank Li <Frank.Li@nxp.com>
---
 drivers/dma/fsl-edma-common.c |  6 ++++++
 drivers/dma/fsl-edma-common.h |  1 +
 drivers/dma/fsl-edma-main.c   | 22 ++++++++++++++++++++++
 3 files changed, 29 insertions(+)

diff --git a/drivers/dma/fsl-edma-common.c b/drivers/dma/fsl-edma-common.c
index b18faa7cfedb9..f9144b0154396 100644
--- a/drivers/dma/fsl-edma-common.c
+++ b/drivers/dma/fsl-edma-common.c
@@ -3,6 +3,7 @@
 // Copyright (c) 2013-2014 Freescale Semiconductor, Inc
 // Copyright (c) 2017 Sysam, Angelo Dureghello  <angelo@sysam.it>
 
+#include <linux/clk.h>
 #include <linux/dmapool.h>
 #include <linux/module.h>
 #include <linux/slab.h>
@@ -810,6 +811,9 @@ int fsl_edma_alloc_chan_resources(struct dma_chan *chan)
 {
 	struct fsl_edma_chan *fsl_chan = to_fsl_edma_chan(chan);
 
+	if (fsl_edma_drvflags(fsl_chan) & FSL_EDMA_DRV_HAS_CHCLK)
+		clk_prepare_enable(fsl_chan->clk);
+
 	fsl_chan->tcd_pool = dma_pool_create("tcd_pool", chan->device->dev,
 				fsl_edma_drvflags(fsl_chan) & FSL_EDMA_DRV_TCD64 ?
 				sizeof(struct fsl_edma_hw_tcd64) : sizeof(struct fsl_edma_hw_tcd),
@@ -838,6 +842,8 @@ void fsl_edma_free_chan_resources(struct dma_chan *chan)
 	fsl_chan->tcd_pool = NULL;
 	fsl_chan->is_sw = false;
 	fsl_chan->srcid = 0;
+	if (fsl_edma_drvflags(fsl_chan) & FSL_EDMA_DRV_HAS_CHCLK)
+		clk_disable_unprepare(fsl_chan->clk);
 }
 
 void fsl_edma_cleanup_vchan(struct dma_device *dmadev)
diff --git a/drivers/dma/fsl-edma-common.h b/drivers/dma/fsl-edma-common.h
index 532f647e540e7..01157912bfd5f 100644
--- a/drivers/dma/fsl-edma-common.h
+++ b/drivers/dma/fsl-edma-common.h
@@ -192,6 +192,7 @@ struct fsl_edma_desc {
 #define FSL_EDMA_DRV_WRAP_IO		BIT(3)
 #define FSL_EDMA_DRV_EDMA64		BIT(4)
 #define FSL_EDMA_DRV_HAS_PD		BIT(5)
+#define FSL_EDMA_DRV_HAS_CHCLK		BIT(6)
 #define FSL_EDMA_DRV_HAS_CHMUX		BIT(7)
 /* imx8 QM audio edma remote local swapped */
 #define FSL_EDMA_DRV_QUIRK_SWAPPED	BIT(8)
diff --git a/drivers/dma/fsl-edma-main.c b/drivers/dma/fsl-edma-main.c
index 41c71c360ff1f..0837535aa7548 100644
--- a/drivers/dma/fsl-edma-main.c
+++ b/drivers/dma/fsl-edma-main.c
@@ -356,6 +356,16 @@ static struct fsl_edma_drvdata imx8qm_audio_data = {
 	.setup_irq = fsl_edma3_irq_init,
 };
 
+static struct fsl_edma_drvdata imx8ulp_data = {
+	.flags = FSL_EDMA_DRV_HAS_CHMUX | FSL_EDMA_DRV_HAS_CHCLK | FSL_EDMA_DRV_HAS_DMACLK |
+		 FSL_EDMA_DRV_EDMA3,
+	.chreg_space_sz = 0x10000,
+	.chreg_off = 0x10000,
+	.mux_off = 0x10000 + offsetof(struct fsl_edma3_ch_reg, ch_mux),
+	.mux_skip = 0x10000,
+	.setup_irq = fsl_edma3_irq_init,
+};
+
 static struct fsl_edma_drvdata imx93_data3 = {
 	.flags = FSL_EDMA_DRV_HAS_DMACLK | FSL_EDMA_DRV_EDMA3,
 	.chreg_space_sz = 0x10000,
@@ -388,6 +398,7 @@ static const struct of_device_id fsl_edma_dt_ids[] = {
 	{ .compatible = "fsl,imx7ulp-edma", .data = &imx7ulp_data},
 	{ .compatible = "fsl,imx8qm-edma", .data = &imx8qm_data},
 	{ .compatible = "fsl,imx8qm-adma", .data = &imx8qm_audio_data},
+	{ .compatible = "fsl,imx8ulp-edma", .data = &imx8ulp_data},
 	{ .compatible = "fsl,imx93-edma3", .data = &imx93_data3},
 	{ .compatible = "fsl,imx93-edma4", .data = &imx93_data4},
 	{ .compatible = "fsl,imx95-edma5", .data = &imx95_data5},
@@ -441,6 +452,7 @@ static int fsl_edma_probe(struct platform_device *pdev)
 	struct fsl_edma_engine *fsl_edma;
 	const struct fsl_edma_drvdata *drvdata = NULL;
 	u32 chan_mask[2] = {0, 0};
+	char clk_name[36];
 	struct edma_regs *regs;
 	int chans;
 	int ret, i;
@@ -550,11 +562,21 @@ static int fsl_edma_probe(struct platform_device *pdev)
 				+ i * drvdata->chreg_space_sz + drvdata->chreg_off + len;
 		fsl_chan->mux_addr = fsl_edma->membase + drvdata->mux_off + i * drvdata->mux_skip;
 
+		if (drvdata->flags & FSL_EDMA_DRV_HAS_CHCLK) {
+			snprintf(clk_name, sizeof(clk_name), "CH%02d-clk", i);
+			fsl_chan->clk = devm_clk_get_enabled(&pdev->dev,
+							     (const char *)clk_name);
+
+			if (IS_ERR(fsl_chan->clk))
+				return PTR_ERR(fsl_chan->clk);
+		}
 		fsl_chan->pdev = pdev;
 		vchan_init(&fsl_chan->vchan, &fsl_edma->dma_dev);
 
 		edma_write_tcdreg(fsl_chan, cpu_to_le32(0), csr);
 		fsl_edma_chan_mux(fsl_chan, 0, false);
+		if (fsl_chan->edma->drvdata->flags & FSL_EDMA_DRV_HAS_CHCLK)
+			clk_disable_unprepare(fsl_chan->clk);
 	}
 
 	ret = fsl_edma->drvdata->setup_irq(pdev, fsl_edma);

-- 
2.34.1