Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma

[linux.git] / sound / soc / intel / boards / kbl_rt5663_rt5514_max98927.c

diff --git a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
index 3fe4a080709598dba91fa8965b1a37fd98c36b68..cfd89ca6a18dacaaa42f5df95d7e573132383a39 100644 (file)
--- a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
+++ b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
@@ -319,7 +319,9 @@ static int kabylake_rt5663_hw_params(struct snd_pcm_substream *substream,
        int ret;
 
        /* use ASRC for internal clocks, as PLL rate isn't multiple of BCLK */
-       rt5663_sel_asrc_clk_src(codec_dai->codec, RT5663_DA_STEREO_FILTER, 1);
+       rt5663_sel_asrc_clk_src(codec_dai->codec,
+                       RT5663_DA_STEREO_FILTER | RT5663_AD_STEREO_FILTER,
+                       RT5663_CLK_SEL_I2S1_ASRC);
 
        ret = snd_soc_dai_set_sysclk(codec_dai,
                        RT5663_SCLK_S_MCLK, 24576000, SND_SOC_CLOCK_IN);
@@ -349,19 +351,10 @@ static int kabylake_ssp0_hw_params(struct snd_pcm_substream *substream,
                                return ret;
                        }
 
-                       ret = snd_soc_dai_set_pll(codec_dai, 0,
-                               RT5514_PLL1_S_BCLK, RT5514_AIF1_BCLK_FREQ,
-                                               RT5514_AIF1_SYSCLK_FREQ);
-                       if (ret < 0) {
-                               dev_err(rtd->dev, "set bclk err: %d\n", ret);
-                               return ret;
-                       }
-
                        ret = snd_soc_dai_set_sysclk(codec_dai,
-                               RT5514_SCLK_S_PLL1, RT5514_AIF1_SYSCLK_FREQ,
-                                                       SND_SOC_CLOCK_IN);
+                               RT5514_SCLK_S_MCLK, 24576000, SND_SOC_CLOCK_IN);
                        if (ret < 0) {
-                               dev_err(rtd->dev, "set sclk err: %d\n", ret);
+                               dev_err(rtd->dev, "set sysclk err: %d\n", ret);
                                return ret;
                        }
                }