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

Commit fd0f2375 authored by Adam Thomson's avatar Adam Thomson Committed by Mark Brown
Browse files

ASoC: Intel: bxt: Move codec sysclk config to codec_init function 



The MCLK for DA7219 does not change in this platform, but is
currently being configured everytime as part of the platform_clock
event handler for DAPM. The upshot of this is that we have
unnecessary calls to this function, and it also means that if
a stream hasn't yet been started, DA7219 driver does not have the
correct MCLK rates programmed and so the HP detection feature does
not operate as expected.

This patch rectifies this issue by moving the sysclk call to
codec_init function so it's only called once at initialisation.

Signed-off-by: default avatarAdam Thomson <Adam.Thomson.Opensource@diasemi.com>
Acked-by: default avatarSathyanarayana Nujella <sathyanarayana.nujella@intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 2ea659a9

sound/soc/intel/boards/bxt_da7219_max98357a.c

+9 −5
Original line number Original line Diff line number Diff line
@@ -89,11 +89,6 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w, 
		if (ret)

		if (ret)

			dev_err(card->dev, "failed to stop PLL: %d\n", ret);

			dev_err(card->dev, "failed to stop PLL: %d\n", ret);

	} else if(SND_SOC_DAPM_EVENT_ON(event)) {

	} else if(SND_SOC_DAPM_EVENT_ON(event)) {

		ret = snd_soc_dai_set_sysclk(codec_dai,

                        DA7219_CLKSRC_MCLK, 19200000, SND_SOC_CLOCK_IN);

		if (ret)

			dev_err(card->dev, "can't set codec sysclk configuration\n");



		ret = snd_soc_dai_set_pll(codec_dai, 0,

		ret = snd_soc_dai_set_pll(codec_dai, 0,

			DA7219_SYSCLK_PLL_SRM, 0, DA7219_PLL_FREQ_OUT_98304);

			DA7219_SYSCLK_PLL_SRM, 0, DA7219_PLL_FREQ_OUT_98304);

		if (ret)

		if (ret)
@@ -187,8 +182,17 @@ static int broxton_ssp_fixup(struct snd_soc_pcm_runtime *rtd, 
static int broxton_da7219_codec_init(struct snd_soc_pcm_runtime *rtd)

static int broxton_da7219_codec_init(struct snd_soc_pcm_runtime *rtd)

{

{

	int ret;

	int ret;

	struct snd_soc_dai *codec_dai = rtd->codec_dai;

	struct snd_soc_codec *codec = rtd->codec;

	struct snd_soc_codec *codec = rtd->codec;





	/* Configure sysclk for codec */

	ret = snd_soc_dai_set_sysclk(codec_dai, DA7219_CLKSRC_MCLK, 19200000,

				     SND_SOC_CLOCK_IN);

	if (ret) {

		dev_err(rtd->dev, "can't set codec sysclk configuration\n");

		return ret;

	}



	/*

	/*

	 * Headset buttons map to the google Reference headset.

	 * Headset buttons map to the google Reference headset.

	 * These can be configured by userspace.

	 * These can be configured by userspace.