diff options
| author | Wolfram Sang <w.sang@pengutronix.de> | 2011-03-25 16:51:44 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-03-26 17:24:55 +0000 |
| commit | 2c4cf17a52f04fbe929977252d5b8ab81d2c6e9b (patch) | |
| tree | 2e89e85487cebf9da8f296f20242370eb3f5b316 /sound/soc | |
| parent | 0ca03cd7d0fa3bfbd56958136a10f19733c4ce12 (diff) | |
| download | linux-2c4cf17a52f04fbe929977252d5b8ab81d2c6e9b.tar.gz linux-2c4cf17a52f04fbe929977252d5b8ab81d2c6e9b.tar.bz2 linux-2c4cf17a52f04fbe929977252d5b8ab81d2c6e9b.zip | |
ASoC: imx: set watermarks for mx2-dma
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>
Cc: stable@kernel.org
Diffstat (limited to 'sound/soc')
| -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, 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 671ef8dd524c..b2ed764fd896 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 a4406a134892..dc8a87530e3e 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 */ |