All of lore.kernel.org
 help / color / mirror / Atom feed
From: Frank Li <Frank.Li@nxp.com>
To: frank.li@nxp.com, krzysztof.kozlowski+dt@linaro.org,
	peng.fan@nxp.com, vkoul@kernel.org
Cc: devicetree@vger.kernel.org, dmaengine@vger.kernel.org,
	imx@lists.linux.dev, joy.zou@nxp.com,
	linux-kernel@vger.kernel.org, robh+dt@kernel.org,
	shenwei.wang@nxp.com
Subject: [PATCH v2 04/12] dmaengine: fsl-edma: remove v3 from enum edma_version
Date: Mon, 29 May 2023 16:04:45 -0400	[thread overview]
Message-ID: <20230529200453.1423796-5-Frank.Li@nxp.com> (raw)
In-Reply-To: <20230529200453.1423796-1-Frank.Li@nxp.com>

The new IP of edma refers to version 3 in the hardware documentation.
However, the presence of "v3" in the code is merely a software indication
to differentiate between certain chips. To prevent confusion in the
future, this commit removes "v3" from the enum edma_version.

Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
 drivers/dma/fsl-edma-common.c | 2 +-
 drivers/dma/fsl-edma-common.h | 2 +-
 drivers/dma/fsl-edma-main.c   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/dma/fsl-edma-common.c b/drivers/dma/fsl-edma-common.c
index 10dcc1435d37..e5c7497c1ff3 100644
--- a/drivers/dma/fsl-edma-common.c
+++ b/drivers/dma/fsl-edma-common.c
@@ -120,7 +120,7 @@ void fsl_edma_chan_mux(struct fsl_edma_chan *fsl_chan,
 	muxaddr = fsl_chan->edma->muxbase[ch / chans_per_mux];
 	slot = EDMAMUX_CHCFG_SOURCE(slot);
 
-	if (fsl_chan->edma->drvdata->version == v3)
+	if (fsl_chan->edma->drvdata->flags & FSL_EDMA_DRV_CONFIG32)
 		mux_configure32(fsl_chan, muxaddr, ch_off, slot, enable);
 	else
 		mux_configure8(fsl_chan, muxaddr, ch_off, slot, enable);
diff --git a/drivers/dma/fsl-edma-common.h b/drivers/dma/fsl-edma-common.h
index db137a8c558d..2f13e687a721 100644
--- a/drivers/dma/fsl-edma-common.h
+++ b/drivers/dma/fsl-edma-common.h
@@ -141,11 +141,11 @@ struct fsl_edma_desc {
 enum edma_version {
 	v1, /* 32ch, Vybrid, mpc57x, etc */
 	v2, /* 64ch Coldfire */
-	v3, /* 32ch, i.mx7ulp */
 };
 
 #define FSL_EDMA_DRV_HAS_DMACLK		BIT(0)
 #define FSL_EDMA_DRV_MUX_SWAP		BIT(1)
+#define FSL_EDMA_DRV_CONFIG32		BIT(2)
 struct fsl_edma_drvdata {
 	enum edma_version	version;
 	u32			dmamuxs;
diff --git a/drivers/dma/fsl-edma-main.c b/drivers/dma/fsl-edma-main.c
index f5cf95d185f8..31531b8bde78 100644
--- a/drivers/dma/fsl-edma-main.c
+++ b/drivers/dma/fsl-edma-main.c
@@ -238,9 +238,9 @@ static struct fsl_edma_drvdata ls1028a_data = {
 };
 
 static struct fsl_edma_drvdata imx7ulp_data = {
-	.version = v3,
+	.version = v1,
 	.dmamuxs = 1,
-	.flags = FSL_EDMA_DRV_HAS_DMACLK,
+	.flags = FSL_EDMA_DRV_HAS_DMACLK | FSL_EDMA_DRV_CONFIG32,
 	.setup_irq = fsl_edma2_irq_init,
 };
 
-- 
2.34.1


  parent reply	other threads:[~2023-05-29 20:05 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-29 20:04 [PATCH v2 00/12] dmaengine: edma: add freescale edma v3 support Frank Li
2023-05-29 20:04 ` [PATCH v2 01/12] dmaengine: fsl-edma: clean up EXPORT_SYMBOL_GPL in fsl-edma-common.c Frank Li
2023-05-31  6:45   ` Peng Fan
2023-05-29 20:04 ` [PATCH v2 02/12] dmaengine: fsl-edma: clean up fsl_edma_irq_exit() Frank Li
2023-05-31  6:46   ` Peng Fan
2023-05-29 20:04 ` [PATCH v2 03/12] dmaengine: fsl-edma: transition from bool fields to bitmask flags in drvdata Frank Li
2023-05-31  6:47   ` Peng Fan
2023-05-29 20:04 ` Frank Li [this message]
2023-05-31  6:50   ` [PATCH v2 04/12] dmaengine: fsl-edma: remove v3 from enum edma_version Peng Fan
2023-05-31 12:50     ` Frank Li
2023-05-29 20:04 ` [PATCH v2 05/12] dmaengine: fsl-edma: move common IRQ handler to common.c Frank Li
2023-05-29 20:04 ` [PATCH v2 06/12] dmaengine: fsl-edma: simply ATTR_DSIZE and ATTR_SSIZE by using ffs() Frank Li
2023-05-29 20:04 ` [PATCH v2 07/12] dmaengine: fsl-edma: refactor using devm_clk_get_enabled Frank Li
2023-05-29 20:04 ` [PATCH v2 08/12] dmaengine: fsl-edma: move clearing of register interrupt into setup_irq function Frank Li
2023-05-29 20:04 ` [PATCH v2 09/12] dmaengine: fsl-edma: refactor chan_name setup and safety Frank Li
2023-05-29 20:04 ` [PATCH v2 10/12] dmaengine: fsl-edma: move tcd into struct fsl_dma_chan Frank Li
2023-05-29 20:04 ` [PATCH v2 11/12] dmaengine: fsl-edma: integrate v3 support Frank Li
2023-05-29 20:04 ` [PATCH v2 12/12] dt-bindings: fsl-dma: fsl-edma: add edma3 compatible string Frank Li
2023-05-30 13:08   ` Krzysztof Kozlowski
2023-05-30 13:57     ` Frank Li
2023-05-30 14:41       ` Krzysztof Kozlowski

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=20230529200453.1423796-5-Frank.Li@nxp.com \
    --to=frank.li@nxp.com \
    --cc=devicetree@vger.kernel.org \
    --cc=dmaengine@vger.kernel.org \
    --cc=imx@lists.linux.dev \
    --cc=joy.zou@nxp.com \
    --cc=krzysztof.kozlowski+dt@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=peng.fan@nxp.com \
    --cc=robh+dt@kernel.org \
    --cc=shenwei.wang@nxp.com \
    --cc=vkoul@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.