Commit 89339d88 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-fix-v7.0-rockchip-i2s-tdm' of... 

Merge tag 'asoc-fix-v7.0-rockchip-i2s-tdm' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Additional Rockchip fix for v7.0

One more ASoC fix, for a regression with the Rockchip I2S TDM support on
a number of platforms.
parents d08008f1 07830525

sound/soc/rockchip/rockchip_i2s_tdm.c

+10 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 


#define DRV_NAME "rockchip-i2s-tdm"



#define DEFAULT_MCLK_FS				256

#define CH_GRP_MAX				4  /* The max channel 8 / 2 */

#define MULTIPLEX_CH_MAX			10
@@ -665,6 +666,15 @@ static int rockchip_i2s_tdm_hw_params(struct snd_pcm_substream *substream, 
			mclk_rate = i2s_tdm->mclk_rx_freq;

		}



		/*

		 * When the dai/component driver doesn't need to set mclk-fs for a specific

		 * clock, it can skip the call to set_sysclk() for that clock.

		 * In that case, simply use the clock rate from the params and multiply it by

		 * the default mclk-fs value.

		 */

		if (!mclk_rate)

			mclk_rate = DEFAULT_MCLK_FS * params_rate(params);



		err = clk_set_rate(mclk, mclk_rate);

		if (err)

			return err;