Merge tag 'pxa-for-4.19-dma_slave_map' of

https://github.com/rjarzmik/linux into asoc-4.19 for ac'97 deps
此提交包含在:
Mark Brown
2018-06-25 14:05:18 +01:00
當前提交 35fbd905b0
共有 15 個檔案被更改,包括 160 行新增272 行删除

查看文件

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