From: Wolfram Sang <w.sang@pengutronix.de>
To: alsa-devel@alsa-project.org
Cc: Takashi Iwai <tiwai@suse.de>,
open list <linux-kernel@vger.kernel.org>,
Sascha Hauer <s.hauer@pengutronix.de>,
Mark Brown <broonie@opensource.wolfsonmicro.com>,
Wolfram Sang <w.sang@pengutronix.de>,
Timur Tabi <timur@freescale.com>,
Liam Girdwood <lrg@slimlogic.co.uk>
Subject: [PATCH 1/3] ASoC: imx: set watermarks for mx2-dma
Date: Fri, 25 Mar 2011 16:51:44 +0100 [thread overview]
Message-ID: <1301068306-11997-2-git-send-email-w.sang@pengutronix.de> (raw)
In-Reply-To: <1301068306-11997-1-git-send-email-w.sang@pengutronix.de>
They got accidently removed by f0fba2a (ASoC: multi-component - ASoC
Multi-Component Support). Reintroduce them and get rid of the
superfluous defines because the fiq-driver has its own hardcoded values.
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
---
sound/soc/imx/imx-pcm-dma-mx2.c | 5 +++++
sound/soc/imx/imx-ssi.h | 3 ---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/sound/soc/imx/imx-pcm-dma-mx2.c b/sound/soc/imx/imx-pcm-dma-mx2.c
index 671ef8d..b2ed764 100644
--- a/sound/soc/imx/imx-pcm-dma-mx2.c
+++ b/sound/soc/imx/imx-pcm-dma-mx2.c
@@ -303,6 +303,11 @@ static struct snd_soc_platform_driver imx_soc_platform_mx2 = {
static int __devinit imx_soc_platform_probe(struct platform_device *pdev)
{
+ struct imx_ssi *ssi = platform_get_drvdata(pdev);
+
+ ssi->dma_params_tx.burstsize = 6;
+ ssi->dma_params_rx.burstsize = 4;
+
return snd_soc_register_platform(&pdev->dev, &imx_soc_platform_mx2);
}
diff --git a/sound/soc/imx/imx-ssi.h b/sound/soc/imx/imx-ssi.h
index a4406a1..dc8a875 100644
--- a/sound/soc/imx/imx-ssi.h
+++ b/sound/soc/imx/imx-ssi.h
@@ -234,7 +234,4 @@ void imx_pcm_free(struct snd_pcm *pcm);
*/
#define IMX_SSI_DMABUF_SIZE (64 * 1024)
-#define DMA_RXFIFO_BURST 0x4
-#define DMA_TXFIFO_BURST 0x6
-
#endif /* _IMX_SSI_H */
--
1.7.2.5
next prev parent reply other threads:[~2011-03-25 15:52 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-25 15:51 [PATCH 0/3] Fix breakages due to recent updates Wolfram Sang
2011-03-25 15:51 ` Wolfram Sang [this message]
2011-03-26 11:42 ` [PATCH 1/3] ASoC: imx: set watermarks for mx2-dma Liam Girdwood
2011-03-25 15:51 ` [PATCH 2/3] ASoC: imx: fix burstsize for DMA Wolfram Sang
2011-03-26 11:42 ` Liam Girdwood
2011-03-25 15:51 ` [PATCH 3/3] ASoC: imx: remove superfluous code in imx-ssi.c Wolfram Sang
2011-03-26 11:42 ` Liam Girdwood
2011-03-26 17:35 ` [PATCH 0/3] Fix breakages due to recent updates Mark Brown
2011-03-26 17:40 ` Wolfram Sang
2011-03-26 17:42 ` 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=1301068306-11997-2-git-send-email-w.sang@pengutronix.de \
--to=w.sang@pengutronix.de \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lrg@slimlogic.co.uk \
--cc=s.hauer@pengutronix.de \
--cc=timur@freescale.com \
--cc=tiwai@suse.de \
/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).