Merge remote-tracking branches 'asoc/topic/rockchip', 'asoc/topic/rt5659', 'asoc...

diff --cc sound/soc/codecs/rt5659.c
Simple merge

diff --cc sound/soc/codecs/sgtl5000.c
Simple merge

diff --cc sound/soc/codecs/uda134x.c
Simple merge

diff --cc sound/soc/samsung/s3c24xx_uda134x.c
index 92e88bca386e8199d4316898d27195e64251a626,50849e137fc0edf2455a7d643b17c936f2e63794,50849e137fc0edf2455a7d643b17c936f2e63794,1619e762e6350dc6473c7196ab1c32e8296a8561,50849e137fc0edf2455a7d643b17c936f2e63794..7853fbe6ccc92b6785bef74a913add08655b22ec
--- 1/sound/soc/samsung/s3c24xx_uda134x.c
--- 2/sound/soc/samsung/s3c24xx_uda134x.c
--- 3/sound/soc/samsung/s3c24xx_uda134x.c
--- 4/sound/soc/samsung/s3c24xx_uda134x.c
--- 5/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);
                        }