diff options
| author |   Yong Zhi <yong.zhi@intel.com> | 2020-07-17 16:13:36 -0500 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2020-07-20 16:08:23 +0100 |
| commit | 0d95d06a7aae38f3bd61582e00f0cc06b35ca0ab (patch) | |
| tree | 3ea037ef65f0f7d9a5b1c497fb7c4d2fde5a44f2 /sound/soc/intel/boards/sof_rt5682.c | |
| parent | ASoC: Intel: sof_sdw: avoid crash if invalid DSP topology loaded (diff) | |
| download | linux-dev-0d95d06a7aae38f3bd61582e00f0cc06b35ca0ab.tar.xz linux-dev-0d95d06a7aae38f3bd61582e00f0cc06b35ca0ab.zip | |
ASoC: intel: board: sof_rt5682: Update rt1015 pll input clk freq
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>
Diffstat (limited to 'sound/soc/intel/boards/sof_rt5682.c')
| -rw-r--r-- | sound/soc/intel/boards/sof_rt5682.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c index cc8b0f26f724..61a61dcca82a 100644 --- a/sound/soc/intel/boards/sof_rt5682.c +++ b/sound/soc/intel/boards/sof_rt5682.c @@ -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"); |