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

Commit 3e9bee11 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: davinci-mcasp: Restructure the davinci_mcasp_calc_clk_div() 



Change the return value to error_pmm instead of the BCLK div and handle the
divider configuration to McASP within the function when the set flag is
true.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 226e73e2

sound/soc/davinci/davinci-mcasp.c

+19 −19
Original line number Diff line number Diff line
@@ -1000,9 +1000,9 @@ static int mcasp_dit_hw_param(struct davinci_mcasp *mcasp, 
}



static int davinci_mcasp_calc_clk_div(struct davinci_mcasp *mcasp,

				      unsigned int bclk_freq,

				      int *error_ppm)

				      unsigned int bclk_freq, bool set)

{

	int error_ppm;

	int div = mcasp->sysclk_freq / bclk_freq;

	int rem = mcasp->sysclk_freq % bclk_freq;
@@ -1014,13 +1014,18 @@ static int davinci_mcasp_calc_clk_div(struct davinci_mcasp *mcasp, 
			rem = rem - bclk_freq;

		}

	}

	error_ppm = (div*1000000 + (int)div64_long(1000000LL*rem,

		     (int)bclk_freq)) / div - 1000000;



	if (set) {

		if (error_ppm)

		*error_ppm =

			(div*1000000 + (int)div64_long(1000000LL*rem,

						       (int)bclk_freq))

			/div - 1000000;

			dev_info(mcasp->dev, "Sample-rate is off by %d PPM\n",

				 error_ppm);



		__davinci_mcasp_set_clkdiv(mcasp, MCASP_CLKDIV_BCLK, div, 0);

	}



	return div;

	return error_ppm;

}



static int davinci_mcasp_hw_params(struct snd_pcm_substream *substream,
@@ -1045,18 +1050,11 @@ static int davinci_mcasp_hw_params(struct snd_pcm_substream *substream, 
		int slots = mcasp->tdm_slots;

		int rate = params_rate(params);

		int sbits = params_width(params);

		int ppm, div;



		if (mcasp->slot_width)

			sbits = mcasp->slot_width;



		div = davinci_mcasp_calc_clk_div(mcasp, rate*sbits*slots,

						 &ppm);

		if (ppm)

			dev_info(mcasp->dev, "Sample-rate is off by %d PPM\n",

				 ppm);



		__davinci_mcasp_set_clkdiv(mcasp, 1, div, 0);

		davinci_mcasp_calc_clk_div(mcasp, rate * sbits * slots, true);

	}



	ret = mcasp_common_hw_param(mcasp, substream->stream,
@@ -1167,7 +1165,8 @@ static int davinci_mcasp_hw_rule_rate(struct snd_pcm_hw_params *params, 
				davinci_mcasp_dai_rates[i];

			int ppm;



			davinci_mcasp_calc_clk_div(rd->mcasp, bclk_freq, &ppm);

			ppm = davinci_mcasp_calc_clk_div(rd->mcasp, bclk_freq,

							 false);

			if (abs(ppm) < DAVINCI_MAX_RATE_ERROR_PPM) {

				if (range.empty) {

					range.min = davinci_mcasp_dai_rates[i];
@@ -1206,8 +1205,9 @@ static int davinci_mcasp_hw_rule_format(struct snd_pcm_hw_params *params, 
			if (rd->mcasp->slot_width)

				sbits = rd->mcasp->slot_width;



			davinci_mcasp_calc_clk_div(rd->mcasp, sbits*slots*rate,

						   &ppm);

			ppm = davinci_mcasp_calc_clk_div(rd->mcasp,

							 sbits * slots * rate,

							 false);

			if (abs(ppm) < DAVINCI_MAX_RATE_ERROR_PPM) {

				snd_mask_set(&nfmt, i);

				count++;