Commit bf939446 authored by Keyon Jie's avatar Keyon Jie Committed by Mark Brown

ASoC: intel: sof_rt5682: use the topology mclk

We should use the topology configured mclk if it existed, which can make
sure we are aligned with the FW side about the mclk usage.
Signed-off-by: default avatarKeyon Jie <yang.jie@linux.intel.com>
Reviewed-by: default avatarGuennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Reviewed-by: default avatarDaniel Baluta <daniel.baluta@gmail.com>
Signed-off-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20210319124950.3853994-2-kai.vehmanen@linux.intel.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent b951b51e
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include <sound/pcm.h> #include <sound/pcm.h>
#include <sound/pcm_params.h> #include <sound/pcm_params.h>
#include <sound/soc.h> #include <sound/soc.h>
#include <sound/sof.h>
#include <sound/rt5682.h> #include <sound/rt5682.h>
#include <sound/soc-acpi.h> #include <sound/soc-acpi.h>
#include "../../codecs/rt1015.h" #include "../../codecs/rt1015.h"
...@@ -268,10 +269,21 @@ static int sof_rt5682_hw_params(struct snd_pcm_substream *substream, ...@@ -268,10 +269,21 @@ static int sof_rt5682_hw_params(struct snd_pcm_substream *substream,
} }
clk_id = RT5682_PLL1_S_MCLK; clk_id = RT5682_PLL1_S_MCLK;
if (sof_rt5682_quirk & SOF_RT5682_MCLK_24MHZ)
/* get the tplg configured mclk. */
clk_freq = sof_dai_get_mclk(rtd);
/* mclk from the quirk is the first choice */
if (sof_rt5682_quirk & SOF_RT5682_MCLK_24MHZ) {
if (clk_freq != 24000000)
dev_warn(rtd->dev, "configure wrong mclk in tplg, please use 24MHz.\n");
clk_freq = 24000000; clk_freq = 24000000;
else } else if (clk_freq == 0) {
/* use default mclk if not specified correct in topology */
clk_freq = 19200000; clk_freq = 19200000;
} else if (clk_freq < 0) {
return clk_freq;
}
} else { } else {
clk_id = RT5682_PLL1_S_BCLK1; clk_id = RT5682_PLL1_S_BCLK1;
clk_freq = params_rate(params) * 50; clk_freq = params_rate(params) * 50;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment