From: Daniel Mack <zonque@gmail.com>
To: haojian.zhuang@linaro.org, eric.y.miao@gmail.com,
linux-arm-kernel@lists.infradead.org
Cc: mark.rutland@arm.com, s.neumann@raumfeld.com,
linux-mtd@lists.infradead.org, Daniel Mack <zonque@gmail.com>,
cxie4@marvell.com, lars@metafoo.de, nico@linaro.org,
vinod.koul@intel.com, marek.vasut@gmail.com,
ezequiel.garcia@free-electrons.com, rmk+kernel@arm.linux.org.uk,
devicetree@vger.kernel.org, samuel@sortiz.org, arnd@arndb.de,
broonie@kernel.org, mika.westerberg@linux.intel.com,
thomas.petazzoni@free-electrons.com, gregkh@linuxfoundation.org,
g.liakhovetski@gmx.de, sachin.kamat@linaro.org,
kernel@pengutronix.de, djbw@fb.com, davem@davemloft.net
Subject: [PATCH 15/20] ASoC: pxa: pxa-ssp: set dma filter data from startup hook
Date: Wed, 7 Aug 2013 17:34:04 +0200 [thread overview]
Message-ID: <1375889649-14638-16-git-send-email-zonque@gmail.com> (raw)
In-Reply-To: <1375889649-14638-1-git-send-email-zonque@gmail.com>
With the new dmaengine implementation, the filter_data parameter has
to be set earlier, from pxa_ssp_startup().
Signed-off-by: Daniel Mack <zonque@gmail.com>
---
sound/soc/pxa/pxa-ssp.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c
index 3903343..12491bd 100644
--- a/sound/soc/pxa/pxa-ssp.c
+++ b/sound/soc/pxa/pxa-ssp.c
@@ -84,7 +84,6 @@ static void pxa_ssp_disable(struct ssp_device *ssp)
static void pxa_ssp_set_dma_params(struct ssp_device *ssp, int width4,
int out, struct snd_dmaengine_dai_dma_data *dma)
{
- dma->filter_data = out ? &ssp->drcmr_tx : &ssp->drcmr_rx;
dma->addr_width = width4 ? DMA_SLAVE_BUSWIDTH_4_BYTES :
DMA_SLAVE_BUSWIDTH_2_BYTES;
dma->maxburst = 16;
@@ -107,6 +106,10 @@ 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;
+
snd_soc_dai_set_dma_data(cpu_dai, substream, dma);
return ret;
--
1.8.3.1
next prev parent reply other threads:[~2013-08-07 15:34 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-07 15:33 [PATCH 00/20] ARM: pxa: move core and drivers to dmaengine Daniel Mack
2013-08-07 15:33 ` [PATCH 01/20] mtd: pxa3xx-nand: replace pxa_request_dma with dmaengine Daniel Mack
2013-08-07 17:46 ` Ezequiel Garcia
2013-08-08 6:42 ` Daniel Mack
2013-08-08 10:12 ` Ezequiel Garcia
2013-08-08 10:14 ` Daniel Mack
2013-08-07 15:33 ` [PATCH 02/20] mtd: pxa3xx-nand: use mmp_pdma_filter_fn and dma_request_slave_channel_compat Daniel Mack
2013-08-07 15:33 ` [PATCH 03/20] ARM: pxa: ssp: add shortcut for &pdev->dev Daniel Mack
2013-08-08 7:32 ` Brian Norris
2013-08-08 7:52 ` Artem Bityutskiy
2013-08-08 8:20 ` Daniel Mack
2013-08-07 15:33 ` [PATCH 04/20] ARM: pxa: ssp: add DT bindings Daniel Mack
2013-08-07 15:54 ` Arnd Bergmann
2013-08-07 15:33 ` [PATCH 05/20] ARM: pxa: ssp: use devm_ functions Daniel Mack
2013-08-07 15:33 ` [PATCH 06/20] tty: serial: pxa: remove old cruft Daniel Mack
2013-08-07 15:33 ` [PATCH 07/20] spi: spi-pxa2xx: remove legacy PXA DMA bits Daniel Mack
2013-08-07 15:55 ` Mark Brown
2013-08-07 15:59 ` Daniel Mack
2013-08-07 16:41 ` Mark Brown
2013-08-07 15:33 ` [PATCH 08/20] mmc: host: pxamci: switch over to dmaengine use Daniel Mack
2014-10-15 18:32 ` Vasily Khoruzhick
2014-10-16 17:57 ` Vasily Khoruzhick
2013-08-07 15:33 ` [PATCH 09/20] ata: pdata_pxa: migrate over to dmaengine usage Daniel Mack
2013-08-07 15:59 ` Arnd Bergmann
2013-08-07 15:33 ` [PATCH 10/20] net: irda: pxaficp_ir: switch to dmaengine Daniel Mack
2013-08-07 15:34 ` [PATCH 11/20] net: smc91x.c: switch to generic buf-to-buf DMA offload Daniel Mack
2013-08-07 15:34 ` [PATCH 12/20] net: smc911x.c: switch to dmaengine API Daniel Mack
2013-08-07 15:34 ` [PATCH 13/20] ASoC: pxa: pxa-ssp: add DT bindings Daniel Mack
2013-08-07 16:40 ` Mark Brown
2013-08-08 9:39 ` Daniel Mack
2013-08-08 13:20 ` Mark Brown
2013-08-09 13:03 ` Daniel Mack
2013-08-07 15:34 ` [PATCH 14/20] ASoC: pxa: use snd_dmaengine_dai_dma_data Daniel Mack
2013-08-07 15:57 ` Mark Brown
2013-08-07 15:34 ` Daniel Mack [this message]
2013-08-07 15:58 ` [PATCH 15/20] ASoC: pxa: pxa-ssp: set dma filter data from startup hook Mark Brown
2013-08-07 15:34 ` [PATCH 16/20] ASoC: pxa: add DT bindings for pxa2xx-pcm Daniel Mack
2013-08-07 16:06 ` Mark Brown
2013-08-07 15:34 ` [PATCH 17/20] ASoC: pxa: pxa-pcm-lib: switch over to snd-soc-dmaengine-pcm Daniel Mack
2013-08-07 16:07 ` Mark Brown
2013-08-07 16:10 ` Daniel Mack
2013-08-07 16:32 ` Mark Brown
2013-08-08 8:18 ` Daniel Mack
2013-08-08 8:44 ` Lars-Peter Clausen
2013-08-08 9:03 ` Daniel Mack
2013-08-08 9:36 ` Mark Brown
2013-08-08 9:43 ` Daniel Mack
2013-08-08 10:35 ` Mark Brown
2013-08-08 10:39 ` Daniel Mack
2013-08-08 11:03 ` Mark Brown
2013-08-08 10:25 ` Russell King - ARM Linux
2013-08-07 15:34 ` [PATCH 18/20] ARM: pxa: register static mmp_pdma device Daniel Mack
2013-08-07 15:34 ` [PATCH 19/20] ARM: mmp: " Daniel Mack
2013-08-07 15:34 ` [PATCH 20/20] ARM: pxa: remove old DMA implementation Daniel Mack
2013-08-07 16:08 ` [PATCH 00/20] ARM: pxa: move core and drivers to dmaengine Arnd Bergmann
2013-08-09 22:50 ` Robert Jarzmik
2013-08-10 10:56 ` Daniel Mack
2013-08-11 20:05 ` Robert Jarzmik
2013-08-14 10:00 ` Vinod Koul
2013-08-15 15:22 ` Robert Jarzmik
2013-08-15 15:30 ` Daniel Mack
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=1375889649-14638-16-git-send-email-zonque@gmail.com \
--to=zonque@gmail.com \
--cc=arnd@arndb.de \
--cc=broonie@kernel.org \
--cc=cxie4@marvell.com \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=djbw@fb.com \
--cc=eric.y.miao@gmail.com \
--cc=ezequiel.garcia@free-electrons.com \
--cc=g.liakhovetski@gmx.de \
--cc=gregkh@linuxfoundation.org \
--cc=haojian.zhuang@linaro.org \
--cc=kernel@pengutronix.de \
--cc=lars@metafoo.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-mtd@lists.infradead.org \
--cc=marek.vasut@gmail.com \
--cc=mark.rutland@arm.com \
--cc=mika.westerberg@linux.intel.com \
--cc=nico@linaro.org \
--cc=rmk+kernel@arm.linux.org.uk \
--cc=s.neumann@raumfeld.com \
--cc=sachin.kamat@linaro.org \
--cc=samuel@sortiz.org \
--cc=thomas.petazzoni@free-electrons.com \
--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).