From: Lucas Tanure <tanureal@opensource.cirrus.com>
To: James Schulman <james.schulman@cirrus.com>,
David Rhodes <david.rhodes@cirrus.com>,
Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>, Jaroslav Kysela <perex@perex.cz>,
Takashi Iwai <tiwai@suse.com>
Cc: <alsa-devel@alsa-project.org>, <linux-kernel@vger.kernel.org>,
<patches@opensource.cirrus.com>,
Richard Fitzgerald <rf@opensource.cirrus.com>,
Lucas Tanure <tanureal@opensource.cirrus.com>
Subject: [PATCH v3 15/15] ASoC: cs42l42: Wait for PLL to lock before switching to it
Date: Sat, 6 Mar 2021 18:55:53 +0000 [thread overview]
Message-ID: <20210306185553.62053-16-tanureal@opensource.cirrus.com> (raw)
In-Reply-To: <20210306185553.62053-1-tanureal@opensource.cirrus.com>
From: Richard Fitzgerald <rf@opensource.cirrus.com>
The PLL should have locked before using it to supply MCLK.
Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Signed-off-by: Lucas Tanure <tanureal@opensource.cirrus.com>
---
Changes in v3:
- No changes
Changes in v2:
- Lucas signed-off added
sound/soc/codecs/cs42l42.c | 12 +++++++++++-
sound/soc/codecs/cs42l42.h | 2 ++
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/sound/soc/codecs/cs42l42.c b/sound/soc/codecs/cs42l42.c
index d7a314aa59b73..bf982e145e945 100644
--- a/sound/soc/codecs/cs42l42.c
+++ b/sound/soc/codecs/cs42l42.c
@@ -862,6 +862,7 @@ static int cs42l42_mute_stream(struct snd_soc_dai *dai, int mute, int stream)
struct cs42l42_private *cs42l42 = snd_soc_component_get_drvdata(component);
unsigned int regval;
u8 fullScaleVol;
+ int ret;
if (mute) {
/* Mute the headphone */
@@ -887,9 +888,18 @@ static int cs42l42_mute_stream(struct snd_soc_dai *dai, int mute, int stream)
} else {
if (!cs42l42->stream_use) {
/* SCLK must be running before codec unmute */
- if ((cs42l42->bclk < 11289600) && (cs42l42->sclk < 11289600))
+ if ((cs42l42->bclk < 11289600) && (cs42l42->sclk < 11289600)) {
snd_soc_component_update_bits(component, CS42L42_PLL_CTL1,
CS42L42_PLL_START_MASK, 1);
+ ret = regmap_read_poll_timeout(cs42l42->regmap,
+ CS42L42_PLL_LOCK_STATUS,
+ regval,
+ (regval & 1),
+ CS42L42_PLL_LOCK_POLL_US,
+ CS42L42_PLL_LOCK_TIMEOUT_US);
+ if (ret < 0)
+ dev_warn(component->dev, "PLL failed to lock: %d\n", ret);
+ }
/* Mark SCLK as present, turn off internal oscillator */
regmap_multi_reg_write(cs42l42->regmap, cs42l42_to_sclk_seq,
diff --git a/sound/soc/codecs/cs42l42.h b/sound/soc/codecs/cs42l42.h
index 214cee762709d..36b763f0d1a06 100644
--- a/sound/soc/codecs/cs42l42.h
+++ b/sound/soc/codecs/cs42l42.h
@@ -756,6 +756,8 @@
#define CS42L42_NUM_SUPPLIES 5
#define CS42L42_BOOT_TIME_US 3000
#define CS42L42_CLOCK_SWITCH_DELAY_US 150
+#define CS42L42_PLL_LOCK_POLL_US 250
+#define CS42L42_PLL_LOCK_TIMEOUT_US 1250
static const char *const cs42l42_supply_names[CS42L42_NUM_SUPPLIES] = {
"VA",
--
2.30.1
next prev parent reply other threads:[~2021-03-06 19:14 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-06 18:55 [PATCH v3 00/15] Report jack and button detection + Capture Support Lucas Tanure
2021-03-06 18:55 ` [PATCH v3 01/15] ASoC: cs42l42: Fix Bitclock polarity inversion Lucas Tanure
2021-03-06 18:55 ` [PATCH v3 02/15] ASoC: cs42l42: Fix channel width support Lucas Tanure
2021-03-06 18:55 ` [PATCH v3 03/15] ASoC: cs42l42: Fix mixer volume control Lucas Tanure
2021-03-06 18:55 ` [PATCH v3 04/15] ASoC: cs42l42: Don't enable/disable regulator at Bias Level Lucas Tanure
2021-03-06 18:55 ` [PATCH v3 05/15] ASoC: cs42l42: Always wait at least 3ms after reset Lucas Tanure
2021-03-06 18:55 ` [PATCH v3 06/15] ASoC: cs42l42: Remove power if the driver is being removed Lucas Tanure
2021-03-06 18:55 ` [PATCH v3 07/15] ASoC: cs42l42: Disable regulators if probe fails Lucas Tanure
2021-03-06 18:55 ` [PATCH v3 08/15] ASoC: cs42l42: Provide finer control on playback path Lucas Tanure
2021-03-06 18:55 ` [PATCH v3 09/15] ASoC: cs42l42: Set clock source for both ways of stream Lucas Tanure
2021-03-06 18:55 ` [PATCH v3 10/15] ASoC: cs42l42: Add Capture Support Lucas Tanure
2021-03-06 18:55 ` [PATCH v3 11/15] ASoC: cs42l42: Report jack and button detection Lucas Tanure
2021-03-06 18:55 ` [PATCH v3 12/15] ASoC: cs42l42: Use bclk from hw_params if set_sysclk was not called Lucas Tanure
2021-03-06 18:55 ` [PATCH v3 13/15] ASoC: cs42l42: Wait at least 150us after writing SCLK_PRESENT Lucas Tanure
2021-03-06 18:55 ` [PATCH v3 14/15] ASoC: cs42l42: Only start PLL if it is needed Lucas Tanure
2021-03-06 18:55 ` Lucas Tanure [this message]
2021-03-09 19:06 ` (subset) [PATCH v3 00/15] Report jack and button detection + Capture Support Mark Brown
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=20210306185553.62053-16-tanureal@opensource.cirrus.com \
--to=tanureal@opensource.cirrus.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=david.rhodes@cirrus.com \
--cc=james.schulman@cirrus.com \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=patches@opensource.cirrus.com \
--cc=perex@perex.cz \
--cc=rf@opensource.cirrus.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).