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 v2 2/7] dmaengine: mcf-edma: update to 'dmamux_nr' Date: Mon, 27 May 2019 16:51:13 +0800 [thread overview] Message-ID: <20190527085118.40423-3-yibin.gong@nxp.com> (raw) In-Reply-To: <20190527085118.40423-1-yibin.gong@nxp.com> From: Robin Gong <yibin.gong@nxp.com> Update to 'dmamux_nr' instead of static macro DMAMUX_NR since new version edma only has one dmamux. Signed-off-by: Robin Gong <yibin.gong@nxp.com> --- drivers/dma/fsl-edma-common.c | 2 +- drivers/dma/mcf-edma.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/dma/fsl-edma-common.c b/drivers/dma/fsl-edma-common.c index 680b2a0..c9a17fc 100644 --- a/drivers/dma/fsl-edma-common.c +++ b/drivers/dma/fsl-edma-common.c @@ -84,7 +84,7 @@ void fsl_edma_chan_mux(struct fsl_edma_chan *fsl_chan, void __iomem *muxaddr; unsigned int chans_per_mux, ch_off; - chans_per_mux = fsl_chan->edma->n_chans / DMAMUX_NR; + chans_per_mux = fsl_chan->edma->n_chans / fsl_chan->edma->dmamux_nr; ch_off = fsl_chan->vchan.chan.chan_id % chans_per_mux; muxaddr = fsl_chan->edma->muxbase[ch / chans_per_mux]; slot = EDMAMUX_CHCFG_SOURCE(slot); diff --git a/drivers/dma/mcf-edma.c b/drivers/dma/mcf-edma.c index 7de54b2f..4484190 100644 --- a/drivers/dma/mcf-edma.c +++ b/drivers/dma/mcf-edma.c @@ -189,6 +189,7 @@ static int mcf_edma_probe(struct platform_device *pdev) /* Set up version for ColdFire edma */ mcf_edma->version = v2; + mcf_edma->dmamux_nr = DMAMUX_NR; mcf_edma->big_endian = 1; if (!mcf_edma->n_chans) { -- 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 v2 2/7] dmaengine: mcf-edma: update to 'dmamux_nr' Date: Mon, 27 May 2019 16:51:13 +0800 [thread overview] Message-ID: <20190527085118.40423-3-yibin.gong@nxp.com> (raw) In-Reply-To: <20190527085118.40423-1-yibin.gong@nxp.com> From: Robin Gong <yibin.gong@nxp.com> Update to 'dmamux_nr' instead of static macro DMAMUX_NR since new version edma only has one dmamux. Signed-off-by: Robin Gong <yibin.gong@nxp.com> --- drivers/dma/fsl-edma-common.c | 2 +- drivers/dma/mcf-edma.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/dma/fsl-edma-common.c b/drivers/dma/fsl-edma-common.c index 680b2a0..c9a17fc 100644 --- a/drivers/dma/fsl-edma-common.c +++ b/drivers/dma/fsl-edma-common.c @@ -84,7 +84,7 @@ void fsl_edma_chan_mux(struct fsl_edma_chan *fsl_chan, void __iomem *muxaddr; unsigned int chans_per_mux, ch_off; - chans_per_mux = fsl_chan->edma->n_chans / DMAMUX_NR; + chans_per_mux = fsl_chan->edma->n_chans / fsl_chan->edma->dmamux_nr; ch_off = fsl_chan->vchan.chan.chan_id % chans_per_mux; muxaddr = fsl_chan->edma->muxbase[ch / chans_per_mux]; slot = EDMAMUX_CHCFG_SOURCE(slot); diff --git a/drivers/dma/mcf-edma.c b/drivers/dma/mcf-edma.c index 7de54b2f..4484190 100644 --- a/drivers/dma/mcf-edma.c +++ b/drivers/dma/mcf-edma.c @@ -189,6 +189,7 @@ static int mcf_edma_probe(struct platform_device *pdev) /* Set up version for ColdFire edma */ mcf_edma->version = v2; + mcf_edma->dmamux_nr = DMAMUX_NR; mcf_edma->big_endian = 1; if (!mcf_edma->n_chans) { -- 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-27 8:50 UTC|newest] Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-05-27 8:51 [PATCH v2 0/7] add edma2 for i.mx7ulp yibin.gong 2019-05-27 8:51 ` yibin.gong 2019-05-27 8:51 ` [PATCH v2 1/7] dmaengine: fsl-edma: add dmamux_nr for next version yibin.gong 2019-05-27 8:51 ` yibin.gong 2019-05-27 8:51 ` yibin.gong 2019-05-27 8:51 ` yibin.gong [this message] 2019-05-27 8:51 ` [PATCH v2 2/7] dmaengine: mcf-edma: update to 'dmamux_nr' yibin.gong 2019-05-27 8:51 ` [PATCH v2 3/7] dmaengine: fsl-edma-common: move dmamux register to another single function yibin.gong 2019-05-27 8:51 ` yibin.gong 2019-05-27 8:51 ` [PATCH v2 4/7] dmaengine: fsl-edma-common: version check for v2 instead yibin.gong 2019-05-27 8:51 ` yibin.gong 2019-05-27 9:08 ` Sascha Hauer 2019-05-27 9:08 ` Sascha Hauer 2019-05-27 9:52 ` Robin Gong 2019-05-27 9:52 ` Robin Gong 2019-05-27 9:52 ` Robin Gong 2019-05-27 8:51 ` [PATCH v2 5/7] dt-bindings: dma: fsl-edma: add new i.mx7ulp-edma yibin.gong 2019-05-27 8:51 ` yibin.gong 2019-05-27 8:51 ` [PATCH v2 6/7] dmaengine: fsl-edma: add i.mx7ulp edma2 version support yibin.gong 2019-05-27 8:51 ` yibin.gong 2019-05-27 9:05 ` Sascha Hauer 2019-05-27 9:05 ` Sascha Hauer 2019-05-27 10:04 ` Robin Gong 2019-05-27 10:04 ` Robin Gong 2019-05-27 10:04 ` Robin Gong 2019-05-27 10:10 ` Vinod Koul 2019-05-27 10:10 ` Vinod Koul 2019-05-27 8:51 ` [PATCH v2 7/7] ARM: dts: imx7ulp: add edma device node yibin.gong 2019-05-27 8:51 ` 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=20190527085118.40423-3-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: linkBe 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.