summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Fitzgerald <rf@opensource.cirrus.com>2021-07-29 20:09:29 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-08-18 10:06:52 +0300
commit67488f5c9613a1142b25d9365dc6f7ea9773150e (patch)
tree4d1815339c8ae88de3abad30ee53ede8b6ee1a2e
parentb4f870447de18a2998284248d7b72e1c02c4c981 (diff)
downloadlinux-67488f5c9613a1142b25d9365dc6f7ea9773150e.tar.xz
ASoC: cs42l42: Fix bclk calculation for mono
[ Upstream commit 926ef1a4c245c093acc07807e466ad2ef0ff6ccb ] An I2S frame always has a left and right channel slot even if mono data is being sent. So if channels==1 the actual bitclock frequency is 2 * snd_soc_params_to_bclk(params). Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com> Fixes: 2cdba9b045c7 ("ASoC: cs42l42: Use bclk from hw_params if set_sysclk was not called") Link: https://lore.kernel.org/r/20210729170929.6589-3-rf@opensource.cirrus.com Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--sound/soc/codecs/cs42l42.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/codecs/cs42l42.c b/sound/soc/codecs/cs42l42.c
index 0d31c84b0445..fe73a5c70bdd 100644
--- a/sound/soc/codecs/cs42l42.c
+++ b/sound/soc/codecs/cs42l42.c
@@ -820,6 +820,10 @@ static int cs42l42_pcm_hw_params(struct snd_pcm_substream *substream,
cs42l42->srate = params_rate(params);
cs42l42->bclk = snd_soc_params_to_bclk(params);
+ /* I2S frame always has 2 channels even for mono audio */
+ if (channels == 1)
+ cs42l42->bclk *= 2;
+
switch(substream->stream) {
case SNDRV_PCM_STREAM_CAPTURE:
if (channels == 2) {