summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorAlexander Sverdlin <subaparts@yandex.ru>2011-03-07 20:30:36 +0300
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-03-09 13:08:36 +0000
commit5cbf7e49de3276c82705fc303d305ce170793ef6 (patch)
tree7ce2eb217095f0df26bd030d00c9e1a6dc6f6233 /sound
parent6d33cd771b779abd8faeaf63821c200ba36a63b1 (diff)
downloadlinux-3.10-5cbf7e49de3276c82705fc303d305ce170793ef6.tar.gz
linux-3.10-5cbf7e49de3276c82705fc303d305ce170793ef6.tar.bz2
linux-3.10-5cbf7e49de3276c82705fc303d305ce170793ef6.zip
ASoC: Improve EP93xx I2S clocks management.
Improve EP93xx I2S clocks management. Some freqs values are set not exact as they requested for MCLK and original code was not able to find divisors for SCLK and LRCLK. This code just picks up nearest value from 3 possible variants. This patch makes 44100 and 192000 rates working and fixes capture function (by selecting SCLK/LRCLK=64 where possible). All other rates should work as before. Signed-off-by: Alexander Sverdlin <subaparts@yandex.ru> Acked-by: Liam Girdwood <lrg@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/ep93xx/ep93xx-i2s.c19
1 files changed, 9 insertions, 10 deletions
diff --git a/sound/soc/ep93xx/ep93xx-i2s.c b/sound/soc/ep93xx/ep93xx-i2s.c
index 4d3c1389d3d..207d5893d97 100644
--- a/sound/soc/ep93xx/ep93xx-i2s.c
+++ b/sound/soc/ep93xx/ep93xx-i2s.c
@@ -242,7 +242,7 @@ static int ep93xx_i2s_hw_params(struct snd_pcm_substream *substream,
{
struct ep93xx_i2s_info *info = snd_soc_dai_get_drvdata(dai);
unsigned word_len, div, sdiv, lrdiv;
- int found = 0, err;
+ int err;
switch (params_format(params)) {
case SNDRV_PCM_FORMAT_S16_LE:
@@ -275,15 +275,14 @@ static int ep93xx_i2s_hw_params(struct snd_pcm_substream *substream,
* the codec uses.
*/
div = clk_get_rate(info->mclk) / params_rate(params);
- for (sdiv = 2; sdiv <= 4; sdiv += 2)
- for (lrdiv = 64; lrdiv <= 128; lrdiv <<= 1)
- if (sdiv * lrdiv == div) {
- found = 1;
- goto out;
- }
-out:
- if (!found)
- return -EINVAL;
+ sdiv = 4;
+ if (div > (256 + 512) / 2) {
+ lrdiv = 128;
+ } else {
+ lrdiv = 64;
+ if (div < (128 + 256) / 2)
+ sdiv = 2;
+ }
err = clk_set_rate(info->sclk, clk_get_rate(info->mclk) / sdiv);
if (err)