From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Fri, 12 Apr 2013 12:57:04 +0000 (+0100)
Subject: Merge remote-tracking branch 'asoc/topic/dma' into asoc-next
X-Git-Tag: v3.10-rc1~14^2~53^2~17
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=38e8c895d33b0642dc341f83cce0adde4cffbc82;p=platform%2Fkernel%2Flinux-exynos.git

Merge remote-tracking branch 'asoc/topic/dma' into asoc-next
---

38e8c895d33b0642dc341f83cce0adde4cffbc82
diff --cc sound/soc/cirrus/ep93xx-i2s.c
index 8d244be,83075b3..5c1102e
--- a/sound/soc/cirrus/ep93xx-i2s.c
+++ b/sound/soc/cirrus/ep93xx-i2s.c
@@@ -407,10 -403,9 +407,10 @@@ static int ep93xx_i2s_probe(struct plat
  	}
  
  	dev_set_drvdata(&pdev->dev, info);
- 	info->dma_params = ep93xx_i2s_dma_params;
+ 	info->dma_data = ep93xx_i2s_dma_data;
  
 -	err = snd_soc_register_dai(&pdev->dev, &ep93xx_i2s_dai);
 +	err = snd_soc_register_component(&pdev->dev, &ep93xx_i2s_component,
 +					 &ep93xx_i2s_dai, 1);
  	if (err)
  		goto fail_put_lrclk;
  
diff --cc sound/soc/omap/omap-dmic.c
index 4c54542,a2597fa..2ad0370
--- a/sound/soc/omap/omap-dmic.c
+++ b/sound/soc/omap/omap-dmic.c
@@@ -497,22 -491,11 +495,12 @@@ static int asoc_dmic_probe(struct platf
  		goto err_put_clk;
  	}
  
- 	if (!devm_request_mem_region(&pdev->dev, res->start,
- 				     resource_size(res), pdev->name)) {
- 		dev_err(dmic->dev, "memory region already claimed\n");
- 		ret = -ENODEV;
- 		goto err_put_clk;
- 	}
- 
- 	dmic->io_base = devm_ioremap(&pdev->dev, res->start,
- 				     resource_size(res));
- 	if (!dmic->io_base) {
- 		ret = -ENOMEM;
- 		goto err_put_clk;
- 	}
+ 	dmic->io_base = devm_ioremap_resource(&pdev->dev, res);
+ 	if (IS_ERR(dmic->io_base))
+ 		return PTR_ERR(dmic->io_base);
  
 -	ret = snd_soc_register_dai(&pdev->dev, &omap_dmic_dai);
 +	ret = snd_soc_register_component(&pdev->dev, &omap_dmic_component,
 +					 &omap_dmic_dai, 1);
  	if (ret)
  		goto err_put_clk;
  
diff --cc sound/soc/tegra/tegra20_ac97.c
index b5cee92,2d7b8c2..2f70ea7
--- a/sound/soc/tegra/tegra20_ac97.c
+++ b/sound/soc/tegra/tegra20_ac97.c
@@@ -393,17 -390,16 +394,17 @@@ static int tegra20_ac97_platform_probe(
  	}
  
  	ac97->capture_dma_data.addr = mem->start + TEGRA20_AC97_FIFO_RX1;
- 	ac97->capture_dma_data.wrap = 4;
- 	ac97->capture_dma_data.width = 32;
- 	ac97->capture_dma_data.req_sel = of_dma[1];
+ 	ac97->capture_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
+ 	ac97->capture_dma_data.maxburst = 4;
+ 	ac97->capture_dma_data.slave_id = of_dma[1];
  
  	ac97->playback_dma_data.addr = mem->start + TEGRA20_AC97_FIFO_TX1;
- 	ac97->playback_dma_data.wrap = 4;
- 	ac97->playback_dma_data.width = 32;
- 	ac97->playback_dma_data.req_sel = of_dma[1];
+ 	ac97->capture_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
+ 	ac97->capture_dma_data.maxburst = 4;
+ 	ac97->capture_dma_data.slave_id = of_dma[0];
  
 -	ret = snd_soc_register_dais(&pdev->dev, &tegra20_ac97_dai, 1);
 +	ret = snd_soc_register_component(&pdev->dev, &tegra20_ac97_component,
 +					 &tegra20_ac97_dai, 1);
  	if (ret) {
  		dev_err(&pdev->dev, "Could not register DAI: %d\n", ret);
  		ret = -ENOMEM;