From: Mark Brown <broonie@kernel.org>
Date: Fri, 28 Oct 2016 17:33:24 +0000 (+0100)
Subject: Merge branch 'fix/samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Tag: v4.14-rc1~1892^2~3^2~4^5~12
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=990fcfefc925a959e204a44fc479efcc236ebced;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'fix/samsung' of git://git./linux/kernel/git/broonie/sound into asoc-samsung
---

990fcfefc925a959e204a44fc479efcc236ebced
diff --cc sound/soc/samsung/s3c24xx-i2s.c
index 7c7061b,9052f6a..3b4bef9
--- a/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;
  	}