|
@@ -127,25 +127,25 @@ struct s3c_pcm_info {
|
|
|
struct clk *pclk;
|
|
|
struct clk *cclk;
|
|
|
|
|
|
- struct s3c_dma_params *dma_playback;
|
|
|
- struct s3c_dma_params *dma_capture;
|
|
|
+ struct snd_dmaengine_dai_dma_data *dma_playback;
|
|
|
+ struct snd_dmaengine_dai_dma_data *dma_capture;
|
|
|
};
|
|
|
|
|
|
-static struct s3c_dma_params s3c_pcm_stereo_out[] = {
|
|
|
+static struct snd_dmaengine_dai_dma_data s3c_pcm_stereo_out[] = {
|
|
|
[0] = {
|
|
|
- .dma_size = 4,
|
|
|
+ .addr_width = 4,
|
|
|
},
|
|
|
[1] = {
|
|
|
- .dma_size = 4,
|
|
|
+ .addr_width = 4,
|
|
|
},
|
|
|
};
|
|
|
|
|
|
-static struct s3c_dma_params s3c_pcm_stereo_in[] = {
|
|
|
+static struct snd_dmaengine_dai_dma_data s3c_pcm_stereo_in[] = {
|
|
|
[0] = {
|
|
|
- .dma_size = 4,
|
|
|
+ .addr_width = 4,
|
|
|
},
|
|
|
[1] = {
|
|
|
- .dma_size = 4,
|
|
|
+ .addr_width = 4,
|
|
|
},
|
|
|
};
|
|
|
|
|
@@ -552,15 +552,13 @@ static int s3c_pcm_dev_probe(struct platform_device *pdev)
|
|
|
}
|
|
|
clk_prepare_enable(pcm->pclk);
|
|
|
|
|
|
- s3c_pcm_stereo_in[pdev->id].dma_addr = mem_res->start
|
|
|
- + S3C_PCM_RXFIFO;
|
|
|
- s3c_pcm_stereo_out[pdev->id].dma_addr = mem_res->start
|
|
|
- + S3C_PCM_TXFIFO;
|
|
|
+ s3c_pcm_stereo_in[pdev->id].addr = mem_res->start + S3C_PCM_RXFIFO;
|
|
|
+ s3c_pcm_stereo_out[pdev->id].addr = mem_res->start + S3C_PCM_TXFIFO;
|
|
|
|
|
|
filter = NULL;
|
|
|
if (pcm_pdata) {
|
|
|
- s3c_pcm_stereo_in[pdev->id].slave = pcm_pdata->dma_capture;
|
|
|
- s3c_pcm_stereo_out[pdev->id].slave = pcm_pdata->dma_playback;
|
|
|
+ s3c_pcm_stereo_in[pdev->id].filter_data = pcm_pdata->dma_capture;
|
|
|
+ s3c_pcm_stereo_out[pdev->id].filter_data = pcm_pdata->dma_playback;
|
|
|
filter = pcm_pdata->dma_filter;
|
|
|
}
|
|
|
|