Skip to content

Commit

Permalink
ASoC: Intel: bytcr_rt5640: simplify MCLK quirk tests
Browse files Browse the repository at this point in the history
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: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Acked-By: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Pierre-Louis Bossart authored and Mark Brown committed Sep 19, 2017
1 parent 6356c78 commit 60f5cba
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions sound/soc/intel/boards/bytcr_rt5640.c
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w,
}

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);
if (ret < 0) {
dev_err(card->dev,
Expand All @@ -199,7 +199,7 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w,
48000 * 512,
SND_SOC_CLOCK_IN);
if (!ret) {
if ((byt_rt5640_quirk & BYT_RT5640_MCLK_EN) && priv->mclk)
if (priv->mclk)
clk_disable_unprepare(priv->mclk);
}
}
Expand Down Expand Up @@ -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, "Speaker");

if ((byt_rt5640_quirk & BYT_RT5640_MCLK_EN) && priv->mclk) {
if (priv->mclk) {
/*
* The firmware might enable the clock at
* boot (this information may or may not
Expand Down

0 comments on commit 60f5cba

Please sign in to comment.