From: Clemens Gruber <clemens.gruber@pqgruber.com>
To: alsa-devel@alsa-project.org
Cc: Mark Brown <broonie@kernel.org>,
Fabio Estevam <festevam@gmail.com>, Eric Nelson <eric@nelint.com>,
linux-kernel@vger.kernel.org,
Clemens Gruber <clemens.gruber@pqgruber.com>
Subject: [PATCH 4/6] ASoC: sgtl5000: Disable internal PLL early
Date: Tue, 7 Jun 2016 01:14:51 +0200 [thread overview]
Message-ID: <20160606231453.19377-5-clemens.gruber@pqgruber.com> (raw)
In-Reply-To: <20160606231453.19377-1-clemens.gruber@pqgruber.com>
From: Eric Nelson <eric@nelint.com>
To handle the soft reboot case, the internal PLL must be
disabled in SGTL5000_CHIP_CLK_CTRL before clearing bits
SGTL5000_VCOAMP_POWERUP and SGTL5000_PLL_POWERUP in
register SGTL5000_CHIP_ANA_POWER.
Signed-off-by: Eric Nelson <eric@nelint.com>
Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
sound/soc/codecs/sgtl5000.c | 9 ++++++++-
sound/soc/codecs/sgtl5000.h | 1 +
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c
index 59eee45..9f1d51e 100644
--- a/sound/soc/codecs/sgtl5000.c
+++ b/sound/soc/codecs/sgtl5000.c
@@ -38,7 +38,6 @@
/* default value of sgtl5000 registers */
static const struct reg_default sgtl5000_reg_defaults[] = {
{ SGTL5000_CHIP_DIG_POWER, 0x0000 },
- { SGTL5000_CHIP_CLK_CTRL, 0x0008 },
{ SGTL5000_CHIP_I2S_CTRL, 0x0010 },
{ SGTL5000_CHIP_SSS_CTRL, 0x0010 },
{ SGTL5000_CHIP_ADCDAC_CTRL, 0x020c },
@@ -1280,6 +1279,14 @@ static int sgtl5000_i2c_probe(struct i2c_client *client,
dev_info(&client->dev, "sgtl5000 revision 0x%x\n", rev);
sgtl5000->revision = rev;
+ /* reconfigure the clocks in case we're using the PLL */
+ ret = regmap_write(sgtl5000->regmap,
+ SGTL5000_CHIP_CLK_CTRL,
+ SGTL5000_CHIP_CLK_CTRL_DEFAULT);
+ if (ret)
+ dev_err(&client->dev,
+ "Error %d initializing CHIP_CLK_CTRL\n", ret);
+
/* Follow section 2.2.1.1 of AN3663 */
ana_pwr = SGTL5000_ANA_POWER_DEFAULT;
if (sgtl5000->num_supplies <= VDDD) {
diff --git a/sound/soc/codecs/sgtl5000.h b/sound/soc/codecs/sgtl5000.h
index 1be8237..22f3442 100644
--- a/sound/soc/codecs/sgtl5000.h
+++ b/sound/soc/codecs/sgtl5000.h
@@ -92,6 +92,7 @@
/*
* SGTL5000_CHIP_CLK_CTRL
*/
+#define SGTL5000_CHIP_CLK_CTRL_DEFAULT 0x0008
#define SGTL5000_RATE_MODE_MASK 0x0030
#define SGTL5000_RATE_MODE_SHIFT 4
#define SGTL5000_RATE_MODE_WIDTH 2
--
2.8.3
next prev parent reply other threads:[~2016-06-06 23:16 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-06 23:14 [PATCH 0/6] ASoC: sgtl5000: fix use of regulators and internal LDO Clemens Gruber
2016-06-06 23:14 ` [PATCH 1/6] ASoC: sgtl5000: Fix regulator support Clemens Gruber
2016-06-15 2:12 ` Fabio Estevam
2016-06-15 14:38 ` Applied "ASoC: sgtl5000: Fix regulator support" to the asoc tree Mark Brown
2016-06-06 23:14 ` [PATCH 2/6] ASoC: sgtl5000: Write all default registers Clemens Gruber
2016-06-15 2:12 ` Fabio Estevam
2016-06-06 23:14 ` [PATCH 3/6] ASoC: sgtl5000: Initialize CHIP_ANA_POWER to power-on defaults Clemens Gruber
2016-06-15 2:13 ` Fabio Estevam
2016-06-15 14:38 ` Applied "ASoC: sgtl5000: Initialize CHIP_ANA_POWER to power-on defaults" to the asoc tree Mark Brown
2016-06-06 23:14 ` Clemens Gruber [this message]
2016-06-15 2:13 ` [PATCH 4/6] ASoC: sgtl5000: Disable internal PLL early Fabio Estevam
2016-06-06 23:14 ` [PATCH 5/6] ASoC: sgtl5000: Do not disable regulators in SND_SOC_BIAS_OFF Clemens Gruber
2016-06-15 2:13 ` Fabio Estevam
2016-06-15 14:38 ` Applied "ASoC: sgtl5000: Do not disable regulators in SND_SOC_BIAS_OFF" to the asoc tree Mark Brown
2016-06-06 23:14 ` [PATCH 6/6] ASoC: sgtl5000: Remove misleading comment Clemens Gruber
2016-06-15 2:14 ` Fabio Estevam
2016-06-15 14:38 ` Applied "ASoC: sgtl5000: Remove misleading comment" to the asoc tree Mark Brown
2016-06-07 10:49 ` [PATCH 0/6] ASoC: sgtl5000: fix use of regulators and internal LDO Eric Nelson
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=20160606231453.19377-5-clemens.gruber@pqgruber.com \
--to=clemens.gruber@pqgruber.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=eric@nelint.com \
--cc=festevam@gmail.com \
--cc=linux-kernel@vger.kernel.org \
/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).