summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorJuergen Borleis <jbe@pengutronix.de>2015-07-03 12:39:36 +0200
committerMark Brown <broonie@kernel.org>2015-07-07 14:40:02 +0100
commitebac95a9208e6b5f134df8518df1bfd1b3fee354 (patch)
treef612d9c922509d9877b13125450b8f23c4673467 /sound
parentd770e558e21961ad6cfdf0ff7df0eb5d7d4f0754 (diff)
downloadlinux-stable-ebac95a9208e6b5f134df8518df1bfd1b3fee354.tar.gz
linux-stable-ebac95a9208e6b5f134df8518df1bfd1b3fee354.tar.bz2
linux-stable-ebac95a9208e6b5f134df8518df1bfd1b3fee354.zip
ASoC: fsl-ssi: Fix bitclock calculation for master mode
According to the datasheet 'pm', 'psr' and 'div2' should never be all 0. Since commit 541b03ad6cfe ("ASoC: fsl_ssi: Fix the incorrect limitation of the bit clock rate") this can happen, because for some bitclock rates 'pm' = 0 seems to be a valid choice but does not work due to hardware restrictions. This results into a bad hardware behaviour (slow audio for example). Feature tested on a i.MX25. Signed-off-by: Juergen Borleis <jbe@pengutronix.de> Acked-by: Nicolin Chen <nicoleotsuka@gmail.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/fsl/fsl_ssi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index c7647e066cfd..c0b940e2019f 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -633,7 +633,7 @@ static int fsl_ssi_set_bclk(struct snd_pcm_substream *substream,
sub *= 100000;
do_div(sub, freq);
- if (sub < savesub) {
+ if (sub < savesub && !(i == 0 && psr == 0 && div2 == 0)) {
baudrate = tmprate;
savesub = sub;
pm = i;