diff options
| author | Robert Jarzmik <robert.jarzmik@free.fr> | 2018-06-17 19:02:17 +0200 |
|---|---|---|
| committer | Robert Jarzmik <robert.jarzmik@free.fr> | 2018-06-18 21:32:41 +0200 |
| commit | cd31b80736852d34bc1072f3e579a6fd73a244e7 (patch) | |
| tree | fc2cae085bbec287cf6be7b9d9ef052c8bf366e4 /sound/soc/pxa | |
| parent | b77ed2e6d61d40117272be1b2377c5dfd101e9cd (diff) | |
| download | linux-stable-cd31b80736852d34bc1072f3e579a6fd73a244e7.tar.gz linux-stable-cd31b80736852d34bc1072f3e579a6fd73a244e7.tar.bz2 linux-stable-cd31b80736852d34bc1072f3e579a6fd73a244e7.zip | |
ARM: pxa: change SSP DMA channels allocation
Now the dma_slave_map is available for PXA architecture, switch the SSP
device to it.
This specifically means that :
- for platform data based machines, the DMA requestor channels are
extracted from the slave map, where pxa-ssp-dai.<N> is a 1-1 match to
ssp.<N>, and the channels are either "rx" or "tx".
- for device tree platforms, the dma node should be hooked into the
pxa2xx-ac97 or pxa-ssp-dai node.
Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Acked-by: Daniel Mack <daniel@zonque.org>
Diffstat (limited to 'sound/soc/pxa')
| -rw-r--r-- | sound/soc/pxa/pxa-ssp.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c index 6fc986080130..0b441338bdd4 100644 --- a/sound/soc/pxa/pxa-ssp.c +++ b/sound/soc/pxa/pxa-ssp.c @@ -105,9 +105,8 @@ 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; + dma->chan_name = substream->stream == SNDRV_PCM_STREAM_PLAYBACK ? + "tx" : "rx"; snd_soc_dai_set_dma_data(cpu_dai, substream, dma); |