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

diff --combined sound/soc/tegra/tegra20_ac97.c
index 6c486625321bebb78b6f66370fda54a49a300fcb,964cedf454d13c2ca20526a90a3c28c6bbd9c30f..ae27bcd586d25428458c305c16448395b9f74d88
--- 1/sound/soc/tegra/tegra20_ac97.c
--- 2/sound/soc/tegra/tegra20_ac97.c
+++ b/sound/soc/tegra/tegra20_ac97.c
@@@ -334,12 -334,6 +334,6 @@@ static int tegra20_ac97_platform_probe(
        }
  
        mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (!mem) {
-               dev_err(&pdev->dev, "No memory resource\n");
-               ret = -ENODEV;
-               goto err_clk_put;
-       }
- 
        regs = devm_ioremap_resource(&pdev->dev, mem);
        if (IS_ERR(regs)) {
                ret = PTR_ERR(regs);
@@@ -389,9 -383,9 +383,9 @@@
        ac97->capture_dma_data.slave_id = of_dma[1];
  
        ac97->playback_dma_data.addr = mem->start + TEGRA20_AC97_FIFO_TX1;
 -      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];
 +      ac97->playback_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
 +      ac97->playback_dma_data.maxburst = 4;
 +      ac97->playback_dma_data.slave_id = of_dma[1];
  
        ret = tegra_asoc_utils_init(&ac97->util_data, &pdev->dev);
        if (ret)
@@@ -432,8 -426,6 +426,6 @@@
  
        return 0;
  
- err_unregister_pcm:
-       tegra_pcm_platform_unregister(&pdev->dev);
  err_unregister_component:
        snd_soc_unregister_component(&pdev->dev);
  err_asoc_utils_fini: