1 files changed, 48 insertions, 13 deletions

diff --git a/sound/soc/samsung/speyside.c b/sound/soc/samsung/speyside.c
index 360a333cb7c0..d6dee4d02036 100644
--- a/sound/soc/samsung/speyside.c
+++ b/sound/soc/samsung/speyside.c
@@ -20,24 +20,29 @@
 #define WM8915_HPSEL_GPIO 214
 
 static int speyside_set_bias_level(struct snd_soc_card *card,
+                                   struct snd_soc_dapm_context *dapm,
                                    enum snd_soc_bias_level level)
 {
         struct snd_soc_dai *codec_dai = card->rtd[0].codec_dai;
         int ret;
 
+        if (dapm->dev != codec_dai->dev)
+                return 0;
+
         switch (level) {
         case SND_SOC_BIAS_STANDBY:
-                ret = snd_soc_dai_set_sysclk(codec_dai, WM8915_SYSCLK_MCLK1,
+                ret = snd_soc_dai_set_sysclk(codec_dai, WM8915_SYSCLK_MCLK2,
                                              32768, SND_SOC_CLOCK_IN);
                 if (ret < 0)
                         return ret;
 
-                ret = snd_soc_dai_set_pll(codec_dai, WM8915_FLL_MCLK1,
+                ret = snd_soc_dai_set_pll(codec_dai, WM8915_FLL_MCLK2,
                                           0, 0, 0);
                 if (ret < 0) {
                         pr_err("Failed to stop FLL\n");
                         return ret;
                 }
+                break;
 
         default:
                 break;
@@ -46,6 +51,45 @@ static int speyside_set_bias_level(struct snd_soc_card *card,
         return 0;
 }
 
+static int speyside_set_bias_level_post(struct snd_soc_card *card,
+                                        struct snd_soc_dapm_context *dapm,
+                                        enum snd_soc_bias_level level)
+{
+        struct snd_soc_dai *codec_dai = card->rtd[0].codec_dai;
+        int ret;
+
+        if (dapm->dev != codec_dai->dev)
+                return 0;
+
+        switch (level) {
+        case SND_SOC_BIAS_PREPARE:
+                if (card->dapm.bias_level == SND_SOC_BIAS_STANDBY) {
+                        ret = snd_soc_dai_set_pll(codec_dai, 0,
+                                                  WM8915_FLL_MCLK2,
+                                                  32768, 48000 * 256);
+                        if (ret < 0) {
+                                pr_err("Failed to start FLL\n");
+                                return ret;
+                        }
+
+                        ret = snd_soc_dai_set_sysclk(codec_dai,
+                                                     WM8915_SYSCLK_FLL,
+                                                     48000 * 256,
+                                                     SND_SOC_CLOCK_IN);
+                        if (ret < 0)
+                                return ret;
+                }
+                break;
+
+        default:
+                break;
+        }
+
+        card->dapm.bias_level = level;
+
+        return 0;
+}
+
 static int speyside_hw_params(struct snd_pcm_substream *substream,
                               struct snd_pcm_hw_params *params)
 {
@@ -66,16 +110,6 @@ static int speyside_hw_params(struct snd_pcm_substream *substream,
         if (ret < 0)
                 return ret;
 
-        ret = snd_soc_dai_set_pll(codec_dai, 0, WM8915_FLL_MCLK1,
-                                  32768, 256 * 48000);
-        if (ret < 0)
-                return ret;
-
-        ret = snd_soc_dai_set_sysclk(codec_dai, WM8915_SYSCLK_FLL,
-                                     256 * 48000, SND_SOC_CLOCK_IN);
-        if (ret < 0)
-                return ret;
-
         return 0;
 }
 
@@ -127,7 +161,7 @@ static int speyside_wm8915_init(struct snd_soc_pcm_runtime *rtd)
         struct snd_soc_codec *codec = rtd->codec;
         int ret;
 
-        ret = snd_soc_dai_set_sysclk(dai, WM8915_SYSCLK_MCLK1, 32768, 0);
+        ret = snd_soc_dai_set_sysclk(dai, WM8915_SYSCLK_MCLK2, 32768, 0);
         if (ret < 0)
                 return ret;
 
@@ -267,6 +301,7 @@ static struct snd_soc_card speyside = {
         .num_configs = ARRAY_SIZE(speyside_codec_conf),
 
         .set_bias_level = speyside_set_bias_level,
+        .set_bias_level_post = speyside_set_bias_level_post,
 
         .controls = controls,
         .num_controls = ARRAY_SIZE(controls),