summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorLionel Xu <Lionel.Xu@freescale.com>2010-07-28 13:34:02 +0800
committerLionel Xu <Lionel.Xu@freescale.com>2010-07-30 13:06:40 +0800
commit9c2baf924ee738127f3d1b06d5a2eda0c3e8ce1c (patch)
tree7e52e1f3831457b1946110d8edbbbee286936b4c /sound
parent00d9ea3faa6472c1e4c5834591d0a6506689468e (diff)
ENGR00125326 MX28 ALSA: Can't play streams with sample rate 8k to 22k
Resolve the problem of playing wav streams with sample rate 8k,11k,16k and 22k. Signed-off-by: Lionel Xu <r63889@freescale.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/sgtl5000.c2
-rw-r--r--sound/soc/mxs/mxs-dai.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c
index 7c0b0f1a9af7..e1d5ef73f4d1 100644
--- a/sound/soc/codecs/sgtl5000.c
+++ b/sound/soc/codecs/sgtl5000.c
@@ -632,6 +632,8 @@ static int sgtl5000_pcm_hw_params(struct snd_pcm_substream *substream,
}
/* SGTL5000 rev1 has a IC bug to prevent switching to MCLK from PLL. */
if (!sgtl5000->master) {
+ sys_fs = sgtl5000->lrclk;
+ clk_ctl = SGTL5000_RATE_MODE_DIV_1 << SGTL5000_RATE_MODE_SHIFT;
if (sys_fs * 256 == sgtl5000->sysclk)
clk_ctl |= SGTL5000_MCLK_FREQ_256FS << \
SGTL5000_MCLK_FREQ_SHIFT;
diff --git a/sound/soc/mxs/mxs-dai.c b/sound/soc/mxs/mxs-dai.c
index a548b9948516..9ca22ecdb4b0 100644
--- a/sound/soc/mxs/mxs-dai.c
+++ b/sound/soc/mxs/mxs-dai.c
@@ -288,6 +288,7 @@ static int mxs_saif_set_dai_clkdiv(struct snd_soc_dai *cpu_dai,
default:
return -EINVAL;
}
+ break;
default:
return -EINVAL;
}