Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ASoC: pxa: pxa-ssp: set dma filter data from startup hook

With the new dmaengine implementation, the filter_data parameter has
to be set earlier, from pxa_ssp_startup().

Signed-off-by: Daniel Mack <zonque@gmail.com>
Acked-by: Mark Brown <broonie@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>

authored by

Daniel Mack and committed by
Mark Brown
a671468d d65a1458

+4 -1
+4 -1
sound/soc/pxa/pxa-ssp.c
··· 84 84 static void pxa_ssp_set_dma_params(struct ssp_device *ssp, int width4, 85 85 int out, struct snd_dmaengine_dai_dma_data *dma) 86 86 { 87 - dma->filter_data = out ? &ssp->drcmr_tx : &ssp->drcmr_rx; 88 87 dma->addr_width = width4 ? DMA_SLAVE_BUSWIDTH_4_BYTES : 89 88 DMA_SLAVE_BUSWIDTH_2_BYTES; 90 89 dma->maxburst = 16; ··· 106 107 dma = kzalloc(sizeof(struct snd_dmaengine_dai_dma_data), GFP_KERNEL); 107 108 if (!dma) 108 109 return -ENOMEM; 110 + 111 + dma->filter_data = substream->stream == SNDRV_PCM_STREAM_PLAYBACK ? 112 + &ssp->drcmr_tx : &ssp->drcmr_rx; 113 + 109 114 snd_soc_dai_set_dma_data(cpu_dai, substream, dma); 110 115 111 116 return ret;