提交 60f5cbae 编写于 作者: P Pierre-Louis Bossart 提交者: Mark Brown

ASoC: Intel: bytcr_rt5640: simplify MCLK quirk tests

remove redundant tests to check MCLK (align with other
machine drivers). some checks remain since when the MCLK is
disabled we fall back to using the bclk as PLL reference
Signed-off-by: NPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Acked-By: NVinod Koul <vinod.koul@intel.com>
Signed-off-by: NMark Brown <broonie@kernel.org>
上级 6356c78c
...@@ -178,7 +178,7 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w, ...@@ -178,7 +178,7 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w,
} }
if (SND_SOC_DAPM_EVENT_ON(event)) { if (SND_SOC_DAPM_EVENT_ON(event)) {
if ((byt_rt5640_quirk & BYT_RT5640_MCLK_EN) && priv->mclk) { if (priv->mclk) {
ret = clk_prepare_enable(priv->mclk); ret = clk_prepare_enable(priv->mclk);
if (ret < 0) { if (ret < 0) {
dev_err(card->dev, dev_err(card->dev,
...@@ -199,7 +199,7 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w, ...@@ -199,7 +199,7 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w,
48000 * 512, 48000 * 512,
SND_SOC_CLOCK_IN); SND_SOC_CLOCK_IN);
if (!ret) { if (!ret) {
if ((byt_rt5640_quirk & BYT_RT5640_MCLK_EN) && priv->mclk) if (priv->mclk)
clk_disable_unprepare(priv->mclk); clk_disable_unprepare(priv->mclk);
} }
} }
...@@ -549,7 +549,7 @@ static int byt_rt5640_init(struct snd_soc_pcm_runtime *runtime) ...@@ -549,7 +549,7 @@ static int byt_rt5640_init(struct snd_soc_pcm_runtime *runtime)
snd_soc_dapm_ignore_suspend(&card->dapm, "Headphone"); snd_soc_dapm_ignore_suspend(&card->dapm, "Headphone");
snd_soc_dapm_ignore_suspend(&card->dapm, "Speaker"); snd_soc_dapm_ignore_suspend(&card->dapm, "Speaker");
if ((byt_rt5640_quirk & BYT_RT5640_MCLK_EN) && priv->mclk) { if (priv->mclk) {
/* /*
* The firmware might enable the clock at * The firmware might enable the clock at
* boot (this information may or may not * boot (this information may or may not
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册