From: Mark Brown <broonie@kernel.org>
Date: Mon, 12 Sep 2016 19:09:23 +0000 (+0100)
Subject: Merge remote-tracking branches 'asoc/topic/rockchip', 'asoc/topic/rt5659', 'asoc... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=a2edb1b7cbbcacf9f36b76ab69d27bffd0270ecf;p=deliverable%2Flinux.git

Merge remote-tracking branches 'asoc/topic/rockchip', 'asoc/topic/rt5659', 'asoc/topic/samsung' and 'asoc/topic/sgtl5000' into asoc-next
---

a2edb1b7cbbcacf9f36b76ab69d27bffd0270ecf
diff --cc sound/soc/samsung/s3c24xx_uda134x.c
index 92e88bca386e,50849e137fc0,50849e137fc0,1619e762e635,50849e137fc0..7853fbe6ccc9
--- a/sound/soc/samsung/s3c24xx_uda134x.c
+++ b/sound/soc/samsung/s3c24xx_uda134x.c
@@@@@@ -54,29 -54,28 -54,28 -54,26 -54,28 +54,27 @@@@@@ static struct snd_pcm_hw_constraint_lis
     };
     #endif
     
--- -static struct platform_device *s3c24xx_uda134x_snd_device;
--- -
     static int s3c24xx_uda134x_startup(struct snd_pcm_substream *substream)
     {
 ----	int ret = 0;
 ++++	struct snd_soc_pcm_runtime *rtd = substream->private_data;
 ++++	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
     #ifdef ENFORCE_RATES
     	struct snd_pcm_runtime *runtime = substream->runtime;
     #endif
 ++++	int ret = 0;
     
     	mutex_lock(&clk_lock);
--- -	pr_debug("%s %d\n", __func__, clk_users);
+++ +
     	if (clk_users == 0) {
--- -		xtal = clk_get(&s3c24xx_uda134x_snd_device->dev, "xtal");
+++ +		xtal = clk_get(rtd->dev, "xtal");
     		if (IS_ERR(xtal)) {
--- -			printk(KERN_ERR "%s cannot get xtal\n", __func__);
+++ +			dev_err(rtd->dev, "%s cannot get xtal\n", __func__);
     			ret = PTR_ERR(xtal);
     		} else {
 ----			pclk = clk_get(&s3c24xx_uda134x_snd_device->dev,
 ----				       "pclk");
 ++++			pclk = clk_get(cpu_dai->dev, "iis");
     			if (IS_ERR(pclk)) {
--- -				printk(KERN_ERR "%s cannot get pclk\n",
--- -				       __func__);
+++ +				dev_err(rtd->dev, "%s cannot get pclk\n",
+++ +					__func__);
     				clk_put(xtal);
     				ret = PTR_ERR(pclk);
     			}