Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60f5cbae authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

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: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Acked-By: default avatarVinod Koul <vinod.koul@intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 6356c78c

sound/soc/intel/boards/bytcr_rt5640.c

+3 −3
Original line number Diff line number Diff line
@@ -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,
@@ -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);

		}

	}
@@ -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