On 03/05/2011 01:57 PM, Alexander Sverdlin wrote:
From: Alexander Sverdlin subaparts@yandex.ru
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.
Signed-off-by: Alexander Sverdlin subaparts@yandex.ru
sound/soc/ep93xx/ep93xx-i2s.c | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/sound/soc/ep93xx/ep93xx-i2s.c b/sound/soc/ep93xx/ep93xx-i2s.c index 0458dd4..3d4c086 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;- }
I don't understand where the magic numbers above come from? Does it work correctly for all rates? I think a comment is needed to explain how this works.
An alternative would be to keep the existing loop form, but try and find the closest match rather than an exact match. Something like this (untested):
unsigned long diff, lowest_diff = ULONG_MAX;
/* Find the closest match for sdiv/lrdiv */ best_sdiv = 2; best_lrdiv = 64; for (sdiv = 2; sdiv <= 4; sdiv += 2) { for (lrdiv = 64; lrdiv <= 128; lrdiv <<= 1) { diff = abs(div - (sdiv * lrdiv)); if (diff < lowest_diff) { lowest_diff = diff; best_sdiv = sdiv; best_lrdiv = lrdiv; } } }
sdiv = best_sdiv; lrdiv = best_lrdiv;
~Ryan