diff options
| author | Wolfram Sang <w.sang@pengutronix.de> | 2011-03-25 16:51:44 +0100 |
|---|---|---|
| committer | Eric Miao <eric.miao@canonical.com> | 2011-11-10 07:39:01 +0800 |
| commit | 6bee914288e97550f676888c3abc3e6c37adfc45 (patch) | |
| tree | 73f18c810cb21aa093575188ff624d78cb53790e /sound | |
| parent | 7470f4bc13e9d6edd98ef57b753f0bb464cc2657 (diff) | |
ASoC: imx: set watermarks for mx2-dma
commit 2c4cf17a52f04fbe929977252d5b8ab81d2c6e9b upstream.
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>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
(cherry picked from commit ad5d054f79f20dfaecf23322783e652eee303d98)
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/imx/imx-pcm-dma-mx2.c | 5 | ||||
| -rw-r--r-- | sound/soc/imx/imx-ssi.h | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/sound/soc/imx/imx-pcm-dma-mx2.c b/sound/soc/imx/imx-pcm-dma-mx2.c index 7f8f9a2b802..0cd56a39311 100644 --- a/sound/soc/imx/imx-pcm-dma-mx2.c +++ b/sound/soc/imx/imx-pcm-dma-mx2.c @@ -304,8 +304,9 @@ 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 = 4; - ssi->dma_params_rx.burstsize = 6; + + 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 d269a2a1251..1b43c620c73 100644 --- a/sound/soc/imx/imx-ssi.h +++ b/sound/soc/imx/imx-ssi.h @@ -228,7 +228,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 */ |