* [PATCH] ASoC: Fix BCLK calculation of WM8994
@ 2010-02-02 9:41 Joonyoung Shim
2010-02-02 9:53 ` Joonyoung Shim
0 siblings, 1 reply; 3+ messages in thread
From: Joonyoung Shim @ 2010-02-02 9:41 UTC (permalink / raw)
To: broonie; +Cc: cw00.choi, alsa-devel, kyungmin.park
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Return-Path: jy0922.shim@samsung.com
X-OriginalArrivalTime: 02 Feb 2010 09:41:49.0527 (UTC) FILETIME=[F1591670:01CAA3EB]
This fixes BCLK calculation and removes unnecessary check code.
Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
---
sound/soc/codecs/wm8994.c | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index 5dd4b29..29f3771 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -3267,15 +3267,12 @@ static int wm8994_hw_params(struct snd_pcm_substream *substream,
*/
best = 0;
for (i = 0; i < ARRAY_SIZE(bclk_divs); i++) {
- if (bclk_divs[i] < 0)
- continue;
- cur_val = (wm8994->aifclk[id] * 10 / bclk_divs[i])
- - bclk_rate * 10;
+ cur_val = (wm8994->aifclk[id] * 10 / bclk_divs[i]) - bclk_rate;
if (cur_val < 0) /* BCLK table is sorted */
break;
best = i;
}
- bclk_rate = wm8994->aifclk[id] / bclk_divs[best];
+ bclk_rate = wm8994->aifclk[id] * 10 / bclk_divs[best];
dev_dbg(dai->dev, "Using BCLK_DIV %d for actual BCLK %dHz\n",
bclk_divs[best], bclk_rate);
bclk |= best << WM8994_AIF1_BCLK_DIV_SHIFT;
--
1.6.3.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] ASoC: Fix BCLK calculation of WM8994
2010-02-02 9:41 [PATCH] ASoC: Fix BCLK calculation of WM8994 Joonyoung Shim
@ 2010-02-02 9:53 ` Joonyoung Shim
2010-02-02 11:20 ` Mark Brown
0 siblings, 1 reply; 3+ messages in thread
From: Joonyoung Shim @ 2010-02-02 9:53 UTC (permalink / raw)
To: broonie; +Cc: kyungmin.park, alsa-devel, Joonyoung Shim, cw00.choi
On 2/2/2010 6:41 PM, Joonyoung Shim wrote:
> Content-Type: text/plain; charset=UTF-8
> Content-Transfer-Encoding: 7bit
>
> This fixes BCLK calculation and removes unnecessary check code.
>
> Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
Sorry, dummy texts were added. Please use below patch.
>From a531baaf93e3514f92a290a2e0bdd5ea5d928a4b Mon Sep 17 00:00:00 2001
From: Joonyoung Shim <jy0922.shim@samsung.com>
Date: Tue, 2 Feb 2010 18:05:42 +0900
Subject: [PATCH] ASoC: Fix BCLK calculation of WM8994
This fixes BCLK calculation and removes unnecessary check code.
Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
---
sound/soc/codecs/wm8994.c | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index 5dd4b29..29f3771 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -3267,15 +3267,12 @@ static int wm8994_hw_params(struct snd_pcm_substream *substream,
*/
best = 0;
for (i = 0; i < ARRAY_SIZE(bclk_divs); i++) {
- if (bclk_divs[i] < 0)
- continue;
- cur_val = (wm8994->aifclk[id] * 10 / bclk_divs[i])
- - bclk_rate * 10;
+ cur_val = (wm8994->aifclk[id] * 10 / bclk_divs[i]) - bclk_rate;
if (cur_val < 0) /* BCLK table is sorted */
break;
best = i;
}
- bclk_rate = wm8994->aifclk[id] / bclk_divs[best];
+ bclk_rate = wm8994->aifclk[id] * 10 / bclk_divs[best];
dev_dbg(dai->dev, "Using BCLK_DIV %d for actual BCLK %dHz\n",
bclk_divs[best], bclk_rate);
bclk |= best << WM8994_AIF1_BCLK_DIV_SHIFT;
--
1.6.3.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] ASoC: Fix BCLK calculation of WM8994
2010-02-02 9:53 ` Joonyoung Shim
@ 2010-02-02 11:20 ` Mark Brown
0 siblings, 0 replies; 3+ messages in thread
From: Mark Brown @ 2010-02-02 11:20 UTC (permalink / raw)
To: Joonyoung Shim; +Cc: cw00.choi, alsa-devel, kyungmin.park
On Tue, Feb 02, 2010 at 06:53:19PM +0900, Joonyoung Shim wrote:
> This fixes BCLK calculation and removes unnecessary check code.
> Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
Oh dear, I'm a bit surprised this tested OK for me but it did. Thanks,
applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-02-02 11:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-02-02 9:41 [PATCH] ASoC: Fix BCLK calculation of WM8994 Joonyoung Shim
2010-02-02 9:53 ` Joonyoung Shim
2010-02-02 11:20 ` Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).