From: Robert Jarzmik <robert.jarzmik@free.fr>
To: Daniel Mack <daniel@zonque.org>,
Haojian Zhuang <haojian.zhuang@gmail.com>,
Robert Jarzmik <robert.jarzmik@free.fr>,
Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
Tejun Heo <tj@kernel.org>, Vinod Koul <vinod.koul@intel.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Ulf Hansson <ulf.hansson@linaro.org>,
Miquel Raynal <miquel.raynal@bootlin.com>,
Boris Brezillon <boris.brezillon@bootlin.com>,
David Woodhouse <dwmw2@infradead.org>,
Brian Norris <computersforpeace@gmail.com>,
Marek Vasut <marek.vasut@gmail.com>,
Richard Weinberger <richard@nod.at>,
Nicolas Pitre <nico@fluxnic.net>,
Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>,
Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-ide@vger.kernel.org,
dmaengine@vger.kernel.org, linux-media@vger.kernel.org,
linux-mmc@vger.kernel.org, linux-mtd@lists.infradead.org,
netdev@vger.kernel.org, alsa-devel@alsa-project.org
Subject: [PATCH v3 14/14] ARM: pxa: change SSP DMA channels allocation
Date: Sun, 17 Jun 2018 19:02:17 +0200 [thread overview]
Message-ID: <20180617170217.24177-15-robert.jarzmik@free.fr> (raw)
In-Reply-To: <20180617170217.24177-1-robert.jarzmik@free.fr>
Now the dma_slave_map is available for PXA architecture, switch the SSP
device to it.
This specifically means that :
- for platform data based machines, the DMA requestor channels are
extracted from the slave map, where pxa-ssp-dai.<N> is a 1-1 match to
ssp.<N>, and the channels are either "rx" or "tx".
- for device tree platforms, the dma node should be hooked into the
pxa2xx-ac97 or pxa-ssp-dai node.
Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Acked-by: Daniel Mack <daniel@zonque.org>
---
Since v1: Removed channel names from platform_data
Since v2: Added Daniel's ack
---
arch/arm/plat-pxa/ssp.c | 47 ----------------------------------------------
include/linux/pxa2xx_ssp.h | 2 --
sound/soc/pxa/pxa-ssp.c | 5 ++---
3 files changed, 2 insertions(+), 52 deletions(-)
diff --git a/arch/arm/plat-pxa/ssp.c b/arch/arm/plat-pxa/ssp.c
index ba13f793fbce..ed36dcab80f1 100644
--- a/arch/arm/plat-pxa/ssp.c
+++ b/arch/arm/plat-pxa/ssp.c
@@ -127,53 +127,6 @@ static int pxa_ssp_probe(struct platform_device *pdev)
if (IS_ERR(ssp->clk))
return PTR_ERR(ssp->clk);
- if (dev->of_node) {
- struct of_phandle_args dma_spec;
- struct device_node *np = dev->of_node;
- int ret;
-
- /*
- * FIXME: we should allocate the DMA channel from this
- * context and pass the channel down to the ssp users.
- * For now, we lookup the rx and tx indices manually
- */
-
- /* rx */
- ret = of_parse_phandle_with_args(np, "dmas", "#dma-cells",
- 0, &dma_spec);
-
- if (ret) {
- dev_err(dev, "Can't parse dmas property\n");
- return -ENODEV;
- }
- ssp->drcmr_rx = dma_spec.args[0];
- of_node_put(dma_spec.np);
-
- /* tx */
- ret = of_parse_phandle_with_args(np, "dmas", "#dma-cells",
- 1, &dma_spec);
- if (ret) {
- dev_err(dev, "Can't parse dmas property\n");
- return -ENODEV;
- }
- ssp->drcmr_tx = dma_spec.args[0];
- of_node_put(dma_spec.np);
- } else {
- res = platform_get_resource(pdev, IORESOURCE_DMA, 0);
- if (res == NULL) {
- dev_err(dev, "no SSP RX DRCMR defined\n");
- return -ENODEV;
- }
- ssp->drcmr_rx = res->start;
-
- res = platform_get_resource(pdev, IORESOURCE_DMA, 1);
- if (res == NULL) {
- dev_err(dev, "no SSP TX DRCMR defined\n");
- return -ENODEV;
- }
- ssp->drcmr_tx = res->start;
- }
-
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (res == NULL) {
dev_err(dev, "no memory resource defined\n");
diff --git a/include/linux/pxa2xx_ssp.h b/include/linux/pxa2xx_ssp.h
index 8461b18e4608..03a7ca46735b 100644
--- a/include/linux/pxa2xx_ssp.h
+++ b/include/linux/pxa2xx_ssp.h
@@ -212,8 +212,6 @@ struct ssp_device {
int type;
int use_count;
int irq;
- int drcmr_rx;
- int drcmr_tx;
struct device_node *of_node;
};
diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c
index 0291c7cb64eb..e09368d89bbc 100644
--- a/sound/soc/pxa/pxa-ssp.c
+++ b/sound/soc/pxa/pxa-ssp.c
@@ -104,9 +104,8 @@ static int pxa_ssp_startup(struct snd_pcm_substream *substream,
dma = kzalloc(sizeof(struct snd_dmaengine_dai_dma_data), GFP_KERNEL);
if (!dma)
return -ENOMEM;
-
- dma->filter_data = substream->stream == SNDRV_PCM_STREAM_PLAYBACK ?
- &ssp->drcmr_tx : &ssp->drcmr_rx;
+ dma->chan_name = substream->stream == SNDRV_PCM_STREAM_PLAYBACK ?
+ "tx" : "rx";
snd_soc_dai_set_dma_data(cpu_dai, substream, dma);
--
2.11.0
next prev parent reply other threads:[~2018-06-17 17:03 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-17 17:02 [PATCH v3 00/14] ARM: pxa: switch to DMA slave maps Robert Jarzmik
2018-06-17 17:02 ` [PATCH v3 01/14] dmaengine: pxa: use a dma slave map Robert Jarzmik
2018-06-17 17:02 ` [PATCH v3 02/14] ARM: pxa: add " Robert Jarzmik
2018-06-17 17:02 ` [PATCH v3 03/14] dmaengine: pxa: add a default requestor policy Robert Jarzmik
2018-06-17 17:02 ` [PATCH v3 04/14] mmc: pxamci: remove the dmaengine compat need Robert Jarzmik
2018-06-17 17:02 ` [PATCH v3 05/14] media: pxa_camera: " Robert Jarzmik
2018-06-17 17:02 ` [PATCH v3 06/14] mtd: rawnand: marvell: " Robert Jarzmik
2018-06-17 18:12 ` Daniel Mack
2018-06-18 19:31 ` Robert Jarzmik
2018-06-17 17:02 ` [PATCH v3 07/14] net: smc911x: " Robert Jarzmik
2018-06-20 17:17 ` Robert Jarzmik
2018-06-20 23:39 ` David Miller
2018-06-21 8:43 ` Robert Jarzmik
2018-06-17 17:02 ` [PATCH v3 08/14] net: smc91x: " Robert Jarzmik
2018-06-20 17:17 ` Robert Jarzmik
2018-06-20 23:40 ` David Miller
2018-06-21 8:44 ` Robert Jarzmik
2018-06-17 17:02 ` [PATCH v3 09/14] ASoC: pxa: " Robert Jarzmik
2018-06-17 18:17 ` Daniel Mack
2018-06-21 8:50 ` Robert Jarzmik
2018-06-17 17:02 ` [PATCH v3 10/14] ata: pata_pxa: " Robert Jarzmik
2018-06-17 17:02 ` [PATCH v3 11/14] dmaengine: pxa: document pxad_param Robert Jarzmik
2018-06-17 17:02 ` [PATCH v3 12/14] dmaengine: pxa: make the filter function internal Robert Jarzmik
2018-06-17 17:02 ` [PATCH v3 13/14] ARM: pxa: remove the DMA IO resources Robert Jarzmik
2018-06-17 17:02 ` Robert Jarzmik [this message]
2018-06-18 8:41 ` [PATCH v3 00/14] ARM: pxa: switch to DMA slave maps Boris Brezillon
2018-06-18 19:56 ` Robert Jarzmik
2018-06-18 20:04 ` Boris Brezillon
2018-06-20 17:07 ` Robert Jarzmik
2018-06-25 13:07 ` Mark Brown
2018-06-27 15:11 ` Robert Jarzmik
2018-06-27 21:03 ` Daniel Mack
2018-06-28 11:52 ` Mark Brown
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=20180617170217.24177-15-robert.jarzmik@free.fr \
--to=robert.jarzmik@free.fr \
--cc=alsa-devel@alsa-project.org \
--cc=b.zolnierkie@samsung.com \
--cc=boris.brezillon@bootlin.com \
--cc=broonie@kernel.org \
--cc=computersforpeace@gmail.com \
--cc=daniel@zonque.org \
--cc=dmaengine@vger.kernel.org \
--cc=dwmw2@infradead.org \
--cc=haojian.zhuang@gmail.com \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=marek.vasut@gmail.com \
--cc=mchehab@kernel.org \
--cc=miquel.raynal@bootlin.com \
--cc=netdev@vger.kernel.org \
--cc=nico@fluxnic.net \
--cc=perex@perex.cz \
--cc=richard@nod.at \
--cc=tiwai@suse.com \
--cc=tj@kernel.org \
--cc=ulf.hansson@linaro.org \
--cc=vinod.koul@intel.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).