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

Commit 9d22fd3c authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/fix/fsl-ssi' into asoc-linus

parents ed87e297 541b03ad

sound/soc/fsl/fsl_ssi.c

+7 −4
Original line number Diff line number Diff line
@@ -603,10 +603,6 @@ static int fsl_ssi_set_bclk(struct snd_pcm_substream *substream, 
	factor = (div2 + 1) * (7 * psr + 1) * 2;



	for (i = 0; i < 255; i++) {

		/* The bclk rate must be smaller than 1/5 sysclk rate */

		if (factor * (i + 1) < 5)

			continue;



		tmprate = freq * factor * (i + 2);



		if (baudclk_is_used)
@@ -614,6 +610,13 @@ static int fsl_ssi_set_bclk(struct snd_pcm_substream *substream, 
		else

			clkrate = clk_round_rate(ssi_private->baudclk, tmprate);



		/*

		 * Hardware limitation: The bclk rate must be

		 * never greater than 1/5 IPG clock rate

		 */

		if (clkrate * 5 > clk_get_rate(ssi_private->clk))

			continue;



		clkrate /= factor;

		afreq = clkrate / (i + 1);