]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ASoC: intel: board: sof_rt5682: Update rt1015 pll input clk freq
authorYong Zhi <yong.zhi@intel.com>
Fri, 17 Jul 2020 21:13:36 +0000 (16:13 -0500)
committerMark Brown <broonie@kernel.org>
Mon, 20 Jul 2020 15:08:23 +0000 (16:08 +0100)
In commit d696a61413b4 ("ASoC: rt1015: Add condition to prevent SoC
providing bclk in ratio of 50 times of sample rate."), PLL input at 50fs
is no longer supported, the new recommended settings at 48Khz rate are:

PLL input       SSP bclk
------------------------
64fs            3.073Mhz
100fs           4.8Mhz

(bclk update is reflected in topoplogy.)

Signed-off-by: Yong Zhi <yong.zhi@intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20200717211337.31956-6-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/intel/boards/sof_rt5682.c

index cc8b0f26f724be9b2478b7ac9a528ee8923d9aed..61a61dcca82afda0b33e275965fc5e5cf8da5feb 100644 (file)
@@ -284,8 +284,15 @@ static int sof_rt1015_hw_params(struct snd_pcm_substream *substream,
                return 0;
 
        for_each_rtd_codec_dais(rtd, i, codec_dai) {
+               /* Set tdm/i2s1 master bclk ratio */
+               ret = snd_soc_dai_set_bclk_ratio(codec_dai, 64);
+               if (ret < 0) {
+                       dev_err(card->dev, "failed to set bclk ratio\n");
+                       return ret;
+               }
+
                ret = snd_soc_dai_set_pll(codec_dai, 0, RT1015_PLL_S_BCLK,
-                                         params_rate(params) * 50,
+                                         params_rate(params) * 64,
                                          params_rate(params) * 256);
                if (ret < 0) {
                        dev_err(card->dev, "failed to set pll\n");