From: Mark Brown <broonie@linaro.org>
Date: Thu, 4 Jul 2013 17:30:02 +0000 (+0100)
Subject: Merge remote-tracking branch 'asoc/fix/mxs' into asoc-linus
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1b36881105249c8a3a0e56434e43d3e2fbbef704;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge remote-tracking branch 'asoc/fix/mxs' into asoc-linus
---

1b36881105249c8a3a0e56434e43d3e2fbbef704
diff --cc sound/soc/mxs/mxs-saif.c
index 49d870034bc3,9ad6dccf791d..54511c5e6a7c
--- a/sound/soc/mxs/mxs-saif.c
+++ b/sound/soc/mxs/mxs-saif.c
@@@ -24,8 -24,11 +24,9 @@@
  #include <linux/slab.h>
  #include <linux/dma-mapping.h>
  #include <linux/clk.h>
+ #include <linux/clk-provider.h>
  #include <linux/delay.h>
  #include <linux/time.h>
 -#include <linux/fsl/mxs-dma.h>
 -#include <linux/pinctrl/consumer.h>
  #include <sound/core.h>
  #include <sound/pcm.h>
  #include <sound/pcm_params.h>
@@@ -732,8 -787,23 +760,15 @@@ static int mxs_saif_probe(struct platfo
  		return ret;
  	}
  
 -	saif->dma_param.dma_data.chan_irq = platform_get_irq(pdev, 1);
 -	if (saif->dma_param.dma_data.chan_irq < 0) {
 -		ret = saif->dma_param.dma_data.chan_irq;
 -		dev_err(&pdev->dev, "failed to get dma irq resource: %d\n",
 -			ret);
 -		return ret;
 -	}
 -
  	platform_set_drvdata(pdev, saif);
  
+ 	/* We only support saif0 being tx and clock master */
+ 	if (saif->id == 0) {
+ 		ret = mxs_saif_mclk_init(pdev);
+ 		if (ret)
+ 			dev_warn(&pdev->dev, "failed to init clocks\n");
+ 	}
+ 
  	ret = snd_soc_register_component(&pdev->dev, &mxs_saif_component,
  					 &mxs_saif_dai, 1);
  	if (ret) {