From: yibin.gong@nxp.com
To: robh@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de,
festevam@gmail.com, mark.rutland@arm.com, vkoul@kernel.org,
dan.j.williams@intel.com
Cc: linux-imx@nxp.com, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org,
devicetree@vger.kernel.org, kernel@pengutronix.de
Subject: [PATCH v3 3/8] dmaengine: fsl-edma-common: move dmamux register to another single function
Date: Wed, 29 May 2019 17:08:43 +0800 [thread overview]
Message-ID: <20190529090848.34350-4-yibin.gong@nxp.com> (raw)
In-Reply-To: <20190529090848.34350-1-yibin.gong@nxp.com>
From: Robin Gong <yibin.gong@nxp.com>
Prepare for edmav2 on i.mx7ulp whose dmamux register is 32bit. No function
impacted.
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
---
drivers/dma/fsl-edma-common.c | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/drivers/dma/fsl-edma-common.c b/drivers/dma/fsl-edma-common.c
index c9a17fc..bb24251 100644
--- a/drivers/dma/fsl-edma-common.c
+++ b/drivers/dma/fsl-edma-common.c
@@ -77,6 +77,19 @@ void fsl_edma_disable_request(struct fsl_edma_chan *fsl_chan)
}
EXPORT_SYMBOL_GPL(fsl_edma_disable_request);
+static void mux_configure8(struct fsl_edma_chan *fsl_chan, void __iomem *addr,
+ u32 off, u32 slot, bool enable)
+{
+ u8 val8;
+
+ if (enable)
+ val8 = EDMAMUX_CHCFG_ENBL | slot;
+ else
+ val8 = EDMAMUX_CHCFG_DIS;
+
+ iowrite8(val8, addr + off);
+}
+
void fsl_edma_chan_mux(struct fsl_edma_chan *fsl_chan,
unsigned int slot, bool enable)
{
@@ -89,10 +102,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 (enable)
- iowrite8(EDMAMUX_CHCFG_ENBL | slot, muxaddr + ch_off);
- else
- iowrite8(EDMAMUX_CHCFG_DIS, muxaddr + ch_off);
+ mux_configure8(fsl_chan, muxaddr, ch_off, slot, enable);
}
EXPORT_SYMBOL_GPL(fsl_edma_chan_mux);
--
2.7.4
WARNING: multiple messages have this Message-ID (diff)
From: yibin.gong@nxp.com
To: robh@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de,
festevam@gmail.com, mark.rutland@arm.com, vkoul@kernel.org,
dan.j.williams@intel.com
Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-imx@nxp.com, kernel@pengutronix.de,
dmaengine@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 3/8] dmaengine: fsl-edma-common: move dmamux register to another single function
Date: Wed, 29 May 2019 17:08:43 +0800 [thread overview]
Message-ID: <20190529090848.34350-4-yibin.gong@nxp.com> (raw)
In-Reply-To: <20190529090848.34350-1-yibin.gong@nxp.com>
From: Robin Gong <yibin.gong@nxp.com>
Prepare for edmav2 on i.mx7ulp whose dmamux register is 32bit. No function
impacted.
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
---
drivers/dma/fsl-edma-common.c | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/drivers/dma/fsl-edma-common.c b/drivers/dma/fsl-edma-common.c
index c9a17fc..bb24251 100644
--- a/drivers/dma/fsl-edma-common.c
+++ b/drivers/dma/fsl-edma-common.c
@@ -77,6 +77,19 @@ void fsl_edma_disable_request(struct fsl_edma_chan *fsl_chan)
}
EXPORT_SYMBOL_GPL(fsl_edma_disable_request);
+static void mux_configure8(struct fsl_edma_chan *fsl_chan, void __iomem *addr,
+ u32 off, u32 slot, bool enable)
+{
+ u8 val8;
+
+ if (enable)
+ val8 = EDMAMUX_CHCFG_ENBL | slot;
+ else
+ val8 = EDMAMUX_CHCFG_DIS;
+
+ iowrite8(val8, addr + off);
+}
+
void fsl_edma_chan_mux(struct fsl_edma_chan *fsl_chan,
unsigned int slot, bool enable)
{
@@ -89,10 +102,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 (enable)
- iowrite8(EDMAMUX_CHCFG_ENBL | slot, muxaddr + ch_off);
- else
- iowrite8(EDMAMUX_CHCFG_DIS, muxaddr + ch_off);
+ mux_configure8(fsl_chan, muxaddr, ch_off, slot, enable);
}
EXPORT_SYMBOL_GPL(fsl_edma_chan_mux);
--
2.7.4
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-05-29 9:07 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-29 9:08 [PATCH v3 0/8] add edma2 for i.mx7ulp yibin.gong
2019-05-29 9:08 ` yibin.gong
2019-05-29 9:08 ` [PATCH v3 1/8] dmaengine: fsl-edma: add dmamux_nr for next version yibin.gong
2019-05-29 9:08 ` yibin.gong
2019-05-29 9:08 ` [PATCH v3 2/8] dmaengine: mcf-edma: update to 'dmamux_nr' yibin.gong
2019-05-29 9:08 ` yibin.gong
2019-05-29 9:08 ` yibin.gong [this message]
2019-05-29 9:08 ` [PATCH v3 3/8] dmaengine: fsl-edma-common: move dmamux register to another single function yibin.gong
2019-05-29 9:08 ` [PATCH v3 4/8] dmaengine: fsl-edma-common: version check for v2 instead yibin.gong
2019-05-29 9:08 ` yibin.gong
2019-05-29 9:08 ` [PATCH v3 5/8] dmaengine: fsl-edma: add drvdata for vf610 yibin.gong
2019-05-29 9:08 ` yibin.gong
2019-06-04 12:33 ` Vinod Koul
2019-06-04 12:33 ` Vinod Koul
2019-06-05 2:25 ` Robin Gong
2019-06-05 2:25 ` Robin Gong
2019-06-05 2:25 ` Robin Gong
2019-05-29 9:08 ` [PATCH v3 6/8] dt-bindings: dma: fsl-edma: add new i.mx7ulp-edma yibin.gong
2019-05-29 9:08 ` yibin.gong
2019-05-29 9:08 ` [PATCH v3 7/8] dmaengine: fsl-edma: add i.mx7ulp edma2 version support yibin.gong
2019-05-29 9:08 ` yibin.gong
2019-06-04 12:37 ` Vinod Koul
2019-06-04 12:37 ` Vinod Koul
2019-06-05 2:29 ` Robin Gong
2019-06-05 2:29 ` Robin Gong
2019-06-05 2:29 ` Robin Gong
2019-05-29 9:08 ` [PATCH v3 8/8] ARM: dts: imx7ulp: add edma device node yibin.gong
2019-05-29 9:08 ` yibin.gong
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=20190529090848.34350-4-yibin.gong@nxp.com \
--to=yibin.gong@nxp.com \
--cc=dan.j.williams@intel.com \
--cc=devicetree@vger.kernel.org \
--cc=dmaengine@vger.kernel.org \
--cc=festevam@gmail.com \
--cc=kernel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=robh@kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=shawnguo@kernel.org \
--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.