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

Commit d114e5f7 authored by Nikesh Oswal's avatar Nikesh Oswal Committed by Mark Brown
Browse files

ASoC: arizona: Fix TDM slot length handling in arizona_hw_params 



TDM slot length was set same as word length, regardless of the value
received in set_tdm_slot. This patch sets the TDM slot length correctly
as received in set_tdm_slot DAI callback

Signed-off-by: default avatarNikesh Oswal <Nikesh.Oswal@wolfsonmicro.com>
Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent ae34a78c

sound/soc/codecs/arizona.c

+4 −2
Original line number Diff line number Diff line
@@ -1278,6 +1278,8 @@ static int arizona_hw_params(struct snd_pcm_substream *substream, 
	else

		rates = &arizona_48k_bclk_rates[0];



	wl = snd_pcm_format_width(params_format(params));



	if (tdm_slots) {

		arizona_aif_dbg(dai, "Configuring for %d %d bit TDM slots\n",

				tdm_slots, tdm_width);
@@ -1285,6 +1287,7 @@ static int arizona_hw_params(struct snd_pcm_substream *substream, 
		channels = tdm_slots;

	} else {

		bclk_target = snd_soc_params_to_bclk(params);

		tdm_width = wl;

	}



	if (chan_limit && chan_limit < channels) {
@@ -1319,8 +1322,7 @@ static int arizona_hw_params(struct snd_pcm_substream *substream, 
	arizona_aif_dbg(dai, "BCLK %dHz LRCLK %dHz\n",

			rates[bclk], rates[bclk] / lrclk);



	wl = snd_pcm_format_width(params_format(params));

	frame = wl << ARIZONA_AIF1TX_WL_SHIFT | wl;

	frame = wl << ARIZONA_AIF1TX_WL_SHIFT | tdm_width;



	reconfig = arizona_aif_cfg_changed(codec, base, bclk, lrclk, frame);