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

Commit e2b3e622 authored by Stuart Longland's avatar Stuart Longland Committed by Mark Brown
Browse files

ASoC: Update Freescale i.MX SSI driver DMA parameter handling 



This updates the i.MX SSI driver to make it compatible with the ASoC tree
following the move of DMA parameters from the DAI to the audio substream
object.

Signed-off-by: default avatarStuart Longland <redhatter@gentoo.org>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Cc: stable@kernel.org
parent 3ca34149

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

+4 −3
Original line number Diff line number Diff line
@@ -72,7 +72,8 @@ static void snd_imx_dma_err_callback(int channel, void *data, int err) 
{

	struct snd_pcm_substream *substream = data;

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct imx_pcm_dma_params *dma_params = rtd->dai->cpu_dai->dma_data;

	struct imx_pcm_dma_params *dma_params = 

		snd_soc_dai_get_dma_data(rtd->dai->cpu_dai, substream);

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct imx_pcm_runtime_data *iprtd = runtime->private_data;

	int ret;
@@ -101,7 +102,7 @@ static int imx_ssi_dma_alloc(struct snd_pcm_substream *substream) 
	struct imx_pcm_runtime_data *iprtd = runtime->private_data;

	int ret;



	dma_params = snd_soc_get_dma_data(rtd->dai->cpu_dai, substream);

	dma_params = snd_soc_dai_get_dma_data(rtd->dai->cpu_dai, substream);



	iprtd->dma = imx_dma_request_by_prio(DRV_NAME, DMA_PRIO_HIGH);

	if (iprtd->dma < 0) {
@@ -211,7 +212,7 @@ static int snd_imx_pcm_prepare(struct snd_pcm_substream *substream) 
	struct imx_pcm_runtime_data *iprtd = runtime->private_data;

	int err;



	dma_params = snd_soc_get_dma_data(rtd->dai->cpu_dai, substream);

	dma_params = snd_soc_dai_get_dma_data(rtd->dai->cpu_dai, substream);



	iprtd->substream = substream;

	iprtd->buf = (unsigned int *)substream->dma_buffer.area;