Commit 3c01b9ee authored by Daniel Baluta's avatar Daniel Baluta Committed by Mark Brown

ASoC: codec: wm8960: Relax bit clock computation

WM8960 derives bit clock from sysclock using BCLKDIV[3:0] of R8
clocking register (See WM8960 datasheet, page 71).

There are use cases, like this:
aplay -Dhw:0,0 -r 48000 -c 1 -f S20_3LE -t raw audio48k20b_3LE1c.pcm

where no BCLKDIV applied to sysclock can give us the exact requested
bitclk, so driver fails to configure clocking and aplay fails to run.

Fix this by relaxing bitclk computation, so that when no exact value
can be derived from sysclk pick the closest value greater than
expected bitclk.
Suggested-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarDaniel Baluta <daniel.baluta@nxp.com>
Acked-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 3ddc9721
...@@ -611,6 +611,10 @@ static const int bclk_divs[] = { ...@@ -611,6 +611,10 @@ static const int bclk_divs[] = {
* - lrclk = sysclk / dac_divs * - lrclk = sysclk / dac_divs
* - 10 * bclk = sysclk / bclk_divs * - 10 * bclk = sysclk / bclk_divs
* *
* If we cannot find an exact match for (sysclk, lrclk, bclk)
* triplet, we relax the bclk such that bclk is chosen as the
* closest available frequency greater than expected bclk.
*
* @wm8960_priv: wm8960 codec private data * @wm8960_priv: wm8960 codec private data
* @mclk: MCLK used to derive sysclk * @mclk: MCLK used to derive sysclk
* @sysclk_idx: sysclk_divs index for found sysclk * @sysclk_idx: sysclk_divs index for found sysclk
...@@ -618,8 +622,9 @@ static const int bclk_divs[] = { ...@@ -618,8 +622,9 @@ static const int bclk_divs[] = {
* @bclk_idx: bclk_divs index for found bclk * @bclk_idx: bclk_divs index for found bclk
* *
* Returns: * Returns:
* -1, in case no sysclk frequency available found * -1, in case no sysclk frequency available found
* 0, in case an exact (@sysclk_idx, @dac_idx, @bclk_idx) match is found * >=0, in case we could derive bclk and lrclk from sysclk using
* (@sysclk_idx, @dac_idx, @bclk_idx) dividers
*/ */
static static
int wm8960_configure_sysclk(struct wm8960_priv *wm8960, int mclk, int wm8960_configure_sysclk(struct wm8960_priv *wm8960, int mclk,
...@@ -627,7 +632,10 @@ int wm8960_configure_sysclk(struct wm8960_priv *wm8960, int mclk, ...@@ -627,7 +632,10 @@ int wm8960_configure_sysclk(struct wm8960_priv *wm8960, int mclk,
{ {
int sysclk, bclk, lrclk; int sysclk, bclk, lrclk;
int i, j, k; int i, j, k;
int diff; int diff, closest = mclk;
/* marker for no match */
*bclk_idx = -1;
bclk = wm8960->bclk; bclk = wm8960->bclk;
lrclk = wm8960->lrclk; lrclk = wm8960->lrclk;
...@@ -648,6 +656,12 @@ int wm8960_configure_sysclk(struct wm8960_priv *wm8960, int mclk, ...@@ -648,6 +656,12 @@ int wm8960_configure_sysclk(struct wm8960_priv *wm8960, int mclk,
*bclk_idx = k; *bclk_idx = k;
break; break;
} }
if (diff > 0 && closest > diff) {
*sysclk_idx = i;
*dac_idx = j;
*bclk_idx = k;
closest = diff;
}
} }
if (k != ARRAY_SIZE(bclk_divs)) if (k != ARRAY_SIZE(bclk_divs))
break; break;
...@@ -655,11 +669,7 @@ int wm8960_configure_sysclk(struct wm8960_priv *wm8960, int mclk, ...@@ -655,11 +669,7 @@ int wm8960_configure_sysclk(struct wm8960_priv *wm8960, int mclk,
if (j != ARRAY_SIZE(dac_divs)) if (j != ARRAY_SIZE(dac_divs))
break; break;
} }
return *bclk_idx;
if (i != ARRAY_SIZE(sysclk_divs))
return 0;
return -1;
} }
static int wm8960_configure_clocking(struct snd_soc_codec *codec) static int wm8960_configure_clocking(struct snd_soc_codec *codec)
...@@ -703,7 +713,7 @@ static int wm8960_configure_clocking(struct snd_soc_codec *codec) ...@@ -703,7 +713,7 @@ static int wm8960_configure_clocking(struct snd_soc_codec *codec)
if (wm8960->clk_id != WM8960_SYSCLK_PLL) { if (wm8960->clk_id != WM8960_SYSCLK_PLL) {
ret = wm8960_configure_sysclk(wm8960, freq_out, &i, &j, &k); ret = wm8960_configure_sysclk(wm8960, freq_out, &i, &j, &k);
if (ret == 0) { if (ret >= 0) {
goto configure_clock; goto configure_clock;
} else if (wm8960->clk_id != WM8960_SYSCLK_AUTO) { } else if (wm8960->clk_id != WM8960_SYSCLK_AUTO) {
dev_err(codec->dev, "failed to configure clock\n"); dev_err(codec->dev, "failed to configure clock\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment