Merge remote-tracking branches 'asoc/topic/rt5659', 'asoc/topic/rt5660', 'asoc/topic...

[cascardo/linux.git] / sound / soc / samsung / s3c2412-i2s.c

diff --git a/sound/soc/samsung/s3c2412-i2s.c b/sound/soc/samsung/s3c2412-i2s.c
index d45dffb..3e89fbc 100644 (file)
--- a/sound/soc/samsung/s3c2412-i2s.c
+++ b/sound/soc/samsung/s3c2412-i2s.c
@@ -34,14 +34,14 @@
 
 #include <linux/platform_data/asoc-s3c.h>
 
-static struct s3c_dma_params s3c2412_i2s_pcm_stereo_out = {
-       .ch_name        = "tx",
-       .dma_size       = 4,
+static struct snd_dmaengine_dai_dma_data s3c2412_i2s_pcm_stereo_out = {
+       .chan_name      = "tx",
+       .addr_width     = 4,
 };
 
-static struct s3c_dma_params s3c2412_i2s_pcm_stereo_in = {
-       .ch_name        = "rx",
-       .dma_size       = 4,
+static struct snd_dmaengine_dai_dma_data s3c2412_i2s_pcm_stereo_in = {
+       .chan_name      = "rx",
+       .addr_width     = 4,
 };
 
 static struct s3c_i2sv2_info s3c2412_i2s;
@@ -52,8 +52,8 @@ static int s3c2412_i2s_probe(struct snd_soc_dai *dai)
 
        pr_debug("Entered %s\n", __func__);
 
-       samsung_asoc_init_dma_data(dai, &s3c2412_i2s_pcm_stereo_out,
-               &s3c2412_i2s_pcm_stereo_in);
+       snd_soc_dai_init_dma_data(dai, &s3c2412_i2s_pcm_stereo_out,
+                                       &s3c2412_i2s_pcm_stereo_in);
 
        ret = s3c_i2sv2_probe(dai, &s3c2412_i2s, S3C2410_PA_IIS);
        if (ret)
@@ -163,10 +163,10 @@ static int s3c2412_iis_dev_probe(struct platform_device *pdev)
        if (IS_ERR(s3c2412_i2s.regs))
                return PTR_ERR(s3c2412_i2s.regs);
 
-       s3c2412_i2s_pcm_stereo_out.dma_addr = res->start + S3C2412_IISTXD;
-       s3c2412_i2s_pcm_stereo_out.slave = pdata->dma_playback;
-       s3c2412_i2s_pcm_stereo_in.dma_addr = res->start + S3C2412_IISRXD;
-       s3c2412_i2s_pcm_stereo_in.slave = pdata->dma_capture;
+       s3c2412_i2s_pcm_stereo_out.addr = res->start + S3C2412_IISTXD;
+       s3c2412_i2s_pcm_stereo_out.filter_data = pdata->dma_playback;
+       s3c2412_i2s_pcm_stereo_in.addr = res->start + S3C2412_IISRXD;
+       s3c2412_i2s_pcm_stereo_in.filter_data = pdata->dma_capture;
 
        ret = s3c_i2sv2_register_component(&pdev->dev, -1,
                                           &s3c2412_i2s_component,