1 files changed, 11 insertions, 0 deletions

diff --git a/sound/soc/codecs/rt5670.c b/sound/soc/codecs/rt5670.c
index 78d85de8af6f..0a027bc94399 100644
--- a/sound/soc/codecs/rt5670.c
+++ b/sound/soc/codecs/rt5670.c
@@ -2190,6 +2190,13 @@ static int rt5670_set_dai_sysclk(struct snd_soc_dai *dai,
         if (freq == rt5670->sysclk && clk_id == rt5670->sysclk_src)
                 return 0;
 
+        if (rt5670->pdata.jd_mode) {
+                if (clk_id == RT5670_SCLK_S_PLL1)
+                        snd_soc_dapm_force_enable_pin(&codec->dapm, "PLL1");
+                else
+                        snd_soc_dapm_disable_pin(&codec->dapm, "PLL1");
+                snd_soc_dapm_sync(&codec->dapm);
+        }
         switch (clk_id) {
         case RT5670_SCLK_S_MCLK:
                 reg_val |= RT5670_SCLK_SRC_MCLK;
@@ -2628,6 +2635,10 @@ static int rt5670_i2c_probe(struct i2c_client *i2c,
         }
 
         if (rt5670->pdata.jd_mode) {
+                regmap_update_bits(rt5670->regmap, RT5670_GLB_CLK,
+                                   RT5670_SCLK_SRC_MASK, RT5670_SCLK_SRC_RCCLK);
+                rt5670->sysclk = 0;
+                rt5670->sysclk_src = RT5670_SCLK_S_RCCLK;
                 regmap_update_bits(rt5670->regmap, RT5670_PWR_ANLG1,
                                    RT5670_PWR_MB, RT5670_PWR_MB);
                 regmap_update_bits(rt5670->regmap, RT5670_PWR_ANLG2,