Merge branch 'fix/samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

diff --cc sound/soc/samsung/i2s.c
Simple merge

diff --cc sound/soc/samsung/s3c2412-i2s.c
Simple merge

diff --cc sound/soc/samsung/s3c24xx-i2s.c
index 7c7061bc0ded69fc29de6a1a97d30ce12b5cebe2,9052f6a7073ec8b0ca5066461ba74dcc01a5f0b8..3b4bef9025a7b81fc1e996ef9e95b5d6c9f60be1
--- 1/sound/soc/samsung/s3c24xx-i2s.c
--- 2/sound/soc/samsung/s3c24xx-i2s.c
+++ b/sound/soc/samsung/s3c24xx-i2s.c
@@@ -438,12 -470,15 +438,13 @@@ static int s3c24xx_iis_dev_probe(struc
                return PTR_ERR(s3c24xx_i2s.regs);
  
        s3c24xx_i2s_pcm_stereo_out.addr = res->start + S3C2410_IISFIFO;
 -      s3c24xx_i2s_pcm_stereo_out.filter_data = pdata->dma_playback;
        s3c24xx_i2s_pcm_stereo_in.addr = res->start + S3C2410_IISFIFO;
 -      s3c24xx_i2s_pcm_stereo_in.filter_data = pdata->dma_capture;
  
-       ret = devm_snd_soc_register_component(&pdev->dev,
-                       &s3c24xx_i2s_component, &s3c24xx_i2s_dai, 1);
+       ret = samsung_asoc_dma_platform_register(&pdev->dev,
+                                                pdata->dma_filter,
+                                                NULL, NULL);
        if (ret) {
 -              pr_err("failed to register the dma: %d\n", ret);
 +              dev_err(&pdev->dev, "Failed to register the DAI\n");
                return ret;
        }