diff options
| author | Daniel Mack <zonque@gmail.com> | 2013-08-12 10:42:40 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-15 11:29:07 +0100 |
| commit | a671468d336bc6c482ab04e88e6eaf38532270ee (patch) | |
| tree | f6f623ff3893f0c5f76ba543626c0057289cfce8 /sound/soc/pxa | |
| parent | d65a14587a9be853a887a1407db133df1fb68e29 (diff) | |
| download | linux-next-a671468d336bc6c482ab04e88e6eaf38532270ee.tar.gz | |
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>
Diffstat (limited to 'sound/soc/pxa')
| -rw-r--r-- | sound/soc/pxa/pxa-ssp.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c index c0dcc3538e35..a3119a00d8fa 100644 --- a/sound/soc/pxa/pxa-ssp.c +++ b/sound/soc/pxa/pxa-ssp.c @@ -84,7 +84,6 @@ static void pxa_ssp_disable(struct ssp_device *ssp) static void pxa_ssp_set_dma_params(struct ssp_device *ssp, int width4, int out, struct snd_dmaengine_dai_dma_data *dma) { - dma->filter_data = out ? &ssp->drcmr_tx : &ssp->drcmr_rx; dma->addr_width = width4 ? DMA_SLAVE_BUSWIDTH_4_BYTES : DMA_SLAVE_BUSWIDTH_2_BYTES; dma->maxburst = 16; @@ -107,6 +106,10 @@ static int pxa_ssp_startup(struct snd_pcm_substream *substream, dma = kzalloc(sizeof(struct snd_dmaengine_dai_dma_data), GFP_KERNEL); if (!dma) return -ENOMEM; + + dma->filter_data = substream->stream == SNDRV_PCM_STREAM_PLAYBACK ? + &ssp->drcmr_tx : &ssp->drcmr_rx; + snd_soc_dai_set_dma_data(cpu_dai, substream, dma); return ret; |