From: Daniel Mack <daniel@zonque.org>
To: Robert Jarzmik <robert.jarzmik@free.fr>,
Haojian Zhuang <haojian.zhuang@gmail.com>,
Ezequiel Garcia <ezequiel.garcia@free-electrons.com>,
Boris Brezillon <boris.brezillon@free-electrons.com>,
David Woodhouse <dwmw2@infradead.org>,
Brian Norris <computersforpeace@gmail.com>,
Marek Vasut <marek.vasut@gmail.com>,
Richard Weinberger <richard@nod.at>,
Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>, Arnd Bergmann <arnd@arndb.de>
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: Re: [PATCH v2 13/13] ARM: pxa: change SSP DMA channels allocation
Date: Fri, 25 May 2018 09:56:13 +0200 [thread overview]
Message-ID: <7e50d21c-c563-156f-d5d3-cd977af0e9d0@zonque.org> (raw)
In-Reply-To: <20180524070703.11901-14-robert.jarzmik@free.fr>
On Thursday, May 24, 2018 09:07 AM, Robert Jarzmik wrote:
> 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>
We should, however, merge what's left of this management glue code into
the users of it, so the dma related properties can be put in the right
devicetree node.
I'll prepare a patch for that for 4.18. This is a good preparation for
this round though.
Thanks,
Daniel
> ---
> Since v1: Removed channel names from platform_data
> ---
> 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);
>
>
next prev parent reply other threads:[~2018-05-25 7:56 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-24 7:06 [PATCH v2 00/13] ARM: pxa: switch to DMA slave maps Robert Jarzmik
2018-05-24 7:06 ` [PATCH v2 01/13] dmaengine: pxa: use a dma slave map Robert Jarzmik
2018-06-25 13:15 ` Applied "dmaengine: pxa: use a dma slave map" to the asoc tree Mark Brown
2018-05-24 7:06 ` [PATCH v2 02/13] ARM: pxa: add dma slave map Robert Jarzmik
2018-05-24 18:11 ` Robert Jarzmik
2018-05-24 7:06 ` [PATCH v2 03/13] mmc: pxamci: remove the dmaengine compat need Robert Jarzmik
2018-06-25 13:15 ` Applied "mmc: pxamci: remove the dmaengine compat need" to the asoc tree Mark Brown
2018-05-24 7:06 ` [PATCH v2 04/13] media: pxa_camera: remove the dmaengine compat need Robert Jarzmik
2018-06-25 13:15 ` Applied "media: pxa_camera: remove the dmaengine compat need" to the asoc tree Mark Brown
2018-05-24 7:06 ` [PATCH v2 05/13] mtd: rawnand: marvell: remove the dmaengine compat need Robert Jarzmik
2018-05-24 9:30 ` Miquel Raynal
2018-05-24 18:07 ` Robert Jarzmik
2018-05-25 6:56 ` Miquel Raynal
2018-05-24 7:06 ` [PATCH v2 06/13] net: smc911x: " Robert Jarzmik
2018-05-24 7:06 ` [PATCH v2 07/13] net: smc91x: " Robert Jarzmik
2018-05-24 7:06 ` [PATCH v2 08/13] ASoC: pxa: " Robert Jarzmik
2018-05-24 13:58 ` Mark Brown
2018-05-25 8:35 ` Daniel Mack
2018-06-29 11:07 ` Applied "ASoC: pxa: remove the dmaengine compat need" to the asoc tree Mark Brown
2018-05-24 7:06 ` [PATCH v2 09/13] ata: pata_pxa: remove the dmaengine compat need Robert Jarzmik
2018-06-25 13:15 ` Applied "ata: pata_pxa: remove the dmaengine compat need" to the asoc tree Mark Brown
2018-05-24 7:07 ` [PATCH v2 10/13] dmaengine: pxa: document pxad_param Robert Jarzmik
2018-05-25 10:59 ` Vinod
2018-06-25 13:15 ` Applied "dmaengine: pxa: document pxad_param" to the asoc tree Mark Brown
2018-05-24 7:07 ` [PATCH v2 11/13] dmaengine: pxa: make the filter function internal Robert Jarzmik
2018-05-25 10:59 ` Vinod
2018-05-24 7:07 ` [PATCH v2 12/13] ARM: pxa: remove the DMA IO resources Robert Jarzmik
2018-06-25 13:15 ` Applied "ARM: pxa: remove the DMA IO resources" to the asoc tree Mark Brown
2018-05-24 7:07 ` [PATCH v2 13/13] ARM: pxa: change SSP DMA channels allocation Robert Jarzmik
2018-05-25 7:56 ` Daniel Mack [this message]
2018-06-25 13:15 ` Applied "ARM: pxa: change SSP DMA channels allocation" to the asoc tree 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=7e50d21c-c563-156f-d5d3-cd977af0e9d0@zonque.org \
--to=daniel@zonque.org \
--cc=alsa-devel@alsa-project.org \
--cc=arnd@arndb.de \
--cc=boris.brezillon@free-electrons.com \
--cc=broonie@kernel.org \
--cc=computersforpeace@gmail.com \
--cc=dmaengine@vger.kernel.org \
--cc=dwmw2@infradead.org \
--cc=ezequiel.garcia@free-electrons.com \
--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=netdev@vger.kernel.org \
--cc=richard@nod.at \
--cc=robert.jarzmik@free.fr \
/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).