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

Commit 8813543e authored by Jyri Sarha's avatar Jyri Sarha Committed by Mark Brown
Browse files

ASoC: mcasp: Fix implicit BLCK divider setting 



The implicit BLCK divider setting was broken by "ASoC: mcasp: don't
override bclk divider if it was provided by the machine"-patch. After
the BCLK divider is implicitly set for the first time the
mcasp->bclk_div gets a non zero value and the implicit setting is
"turned off".

Signed-off-by: default avatarJyri Sarha <jsarha@ti.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent ae34a78c

sound/soc/davinci/davinci-mcasp.c

+11 −3
Original line number Diff line number Diff line
@@ -403,7 +403,8 @@ static int davinci_mcasp_set_dai_fmt(struct snd_soc_dai *cpu_dai, 
	return ret;

}



static int davinci_mcasp_set_clkdiv(struct snd_soc_dai *dai, int div_id, int div)

static int __davinci_mcasp_set_clkdiv(struct snd_soc_dai *dai, int div_id,

				      int div, bool explicit)

{

	struct davinci_mcasp *mcasp = snd_soc_dai_get_drvdata(dai);
@@ -420,6 +421,7 @@ static int davinci_mcasp_set_clkdiv(struct snd_soc_dai *dai, int div_id, int div 
			       ACLKXDIV(div - 1), ACLKXDIV_MASK);

		mcasp_mod_bits(mcasp, DAVINCI_MCASP_ACLKRCTL_REG,

			       ACLKRDIV(div - 1), ACLKRDIV_MASK);

		if (explicit)

			mcasp->bclk_div = div;

		break;
@@ -434,6 +436,12 @@ static int davinci_mcasp_set_clkdiv(struct snd_soc_dai *dai, int div_id, int div 
	return 0;

}



static int davinci_mcasp_set_clkdiv(struct snd_soc_dai *dai, int div_id,

				    int div)

{

	return __davinci_mcasp_set_clkdiv(dai, div_id, div, 1);

}



static int davinci_mcasp_set_sysclk(struct snd_soc_dai *dai, int clk_id,

				    unsigned int freq, int dir)

{
@@ -738,7 +746,7 @@ static int davinci_mcasp_hw_params(struct snd_pcm_substream *substream, 
				 "Inaccurate BCLK: %u Hz / %u != %u Hz\n",

				 mcasp->sysclk_freq, div, bclk_freq);

		}

		davinci_mcasp_set_clkdiv(cpu_dai, 1, div);

		__davinci_mcasp_set_clkdiv(cpu_dai, 1, div, 0);

	}



	ret = mcasp_common_hw_param(mcasp, substream->stream,