From: Daniel Baluta <daniel.baluta@nxp.com>
To: <broonie@kernel.org>, <tiwai@suse.com>,
<ckeepax@opensource.wolfsonmicro.com>, <arnd@arndb.de>,
<lgirdwood@gmail.com>
Cc: <patches@opensource.wolfsonmicro.com>,
<alsa-devel@alsa-project.org>, <linux-kernel@vger.kernel.org>,
Daniel Baluta <daniel.baluta@nxp.com>
Subject: [PATCH v2 2/2] ASoC: codec: wm8960: Relax bit clock computation when using PLL
Date: Wed, 26 Apr 2017 16:09:52 +0300 [thread overview]
Message-ID: <1493212192-7930-3-git-send-email-daniel.baluta@nxp.com> (raw)
In-Reply-To: <1493212192-7930-1-git-send-email-daniel.baluta@nxp.com>
Bitclk is derived from sysclk using bclk_divs.
Sysclk can be derived in two ways:
(1) directly from MLCK
(2) MCLK via PLL
Commit 3c01b9ee2ab9d0d ("ASoC: codec: wm8960: Relax bit clock
computation")
relaxed bitclk computation when sysclk is directly derived from MCLK.
Lets do the same thing when sysclk is derived via PLL.
Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
---
Changes since v2:
* rebase after changes in first patch in the series
sound/soc/codecs/wm8960.c | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c
index d899623..9ed4557 100644
--- a/sound/soc/codecs/wm8960.c
+++ b/sound/soc/codecs/wm8960.c
@@ -679,6 +679,10 @@ int wm8960_configure_sysclk(struct wm8960_priv *wm8960, int mclk,
* - freq_out = sysclk * sysclk_divs
* - 10 * sysclk = bclk * 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.
+ *
* @codec: codec structure
* @freq_in: input frequency used to derive freq out via PLL
* @sysclk_idx: sysclk_divs index for found sysclk
@@ -696,12 +700,14 @@ int wm8960_configure_pll(struct snd_soc_codec *codec, int freq_in,
{
struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);
int sysclk, bclk, lrclk, freq_out;
- int diff;
+ int diff, closest, best_freq_out;
int i, j, k;
bclk = wm8960->bclk;
lrclk = wm8960->lrclk;
+ closest = freq_in;
+ best_freq_out = -EINVAL;
*sysclk_idx = *dac_idx = *bclk_idx = -1;
for (i = 0; i < ARRAY_SIZE(sysclk_divs); ++i) {
@@ -722,10 +728,18 @@ int wm8960_configure_pll(struct snd_soc_codec *codec, int freq_in,
*bclk_idx = k;
return freq_out;
}
+ if (diff > 0 && closest > diff) {
+ *sysclk_idx = i;
+ *dac_idx = j;
+ *bclk_idx = k;
+ closest = diff;
+ best_freq_out = freq_out;
+ }
}
}
}
- return -EINVAL;
+
+ return best_freq_out;
}
static int wm8960_configure_clocking(struct snd_soc_codec *codec)
{
--
2.7.4
next prev parent reply other threads:[~2017-04-26 13:10 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-26 13:09 [PATCH v2 0/2] Relax bitclk computation when using PLL Daniel Baluta
2017-04-26 13:09 ` [PATCH v2 1/2] ASoC: codec: wm9860: avoid maybe-uninitialized warning Daniel Baluta
2017-04-27 10:07 ` Arnd Bergmann
2017-04-27 11:02 ` Daniel Baluta
2017-04-27 11:53 ` Arnd Bergmann
2017-04-30 13:15 ` Applied "ASoC: codec: wm9860: avoid maybe-uninitialized warning" to the asoc tree Mark Brown
2017-04-26 13:09 ` Daniel Baluta [this message]
2017-04-30 13:15 ` Applied "ASoC: codec: wm8960: Relax bit clock computation when using PLL" " Mark Brown
-- strict thread matches above, loose matches on Subject: below --
2017-04-05 13:26 [PATCH v2 0/2] ASoC: codec: wm8960: Relax bit clock computation when using PLL Daniel Baluta
2017-04-05 13:26 ` [PATCH v2 2/2] " Daniel Baluta
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1493212192-7930-3-git-send-email-daniel.baluta@nxp.com \
--to=daniel.baluta@nxp.com \
--cc=alsa-devel@alsa-project.org \
--cc=arnd@arndb.de \
--cc=broonie@kernel.org \
--cc=ckeepax@opensource.wolfsonmicro.com \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=patches@opensource.wolfsonmicro.com \
--cc=tiwai@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).