Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c4cf17a authored by Wolfram Sang's avatar Wolfram Sang Committed by Mark Brown
Browse files

ASoC: imx: set watermarks for mx2-dma 



They got accidently removed by f0fba2ad (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: default avatarWolfram Sang <w.sang@pengutronix.de>
Acked-by: default avatarLiam Girdwood <lrg@ti.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Cc: stable@kernel.org
parent 0ca03cd7

sound/soc/imx/imx-pcm-dma-mx2.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -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)

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);

	return snd_soc_register_platform(&pdev->dev, &imx_soc_platform_mx2);

}

}

sound/soc/imx/imx-ssi.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -234,7 +234,4 @@ void imx_pcm_free(struct snd_pcm *pcm); 
 */

 */

#define IMX_SSI_DMABUF_SIZE	(64 * 1024)

#define IMX_SSI_DMABUF_SIZE	(64 * 1024)





#define DMA_RXFIFO_BURST      0x4

#define DMA_TXFIFO_BURST      0x6



#endif /* _IMX_SSI_H */
 
#endif /* _IMX_SSI_H */