From: Xiubo Li <Li.Xiubo@freescale.com>
To: <lgirdwood@gmail.com>, <broonie@kernel.org>, <perex@perex.cz>,
<tiwai@suse.de>, <fabio.estevam@freescale.com>,
<LW@KARO-electronics.de>, <oskar@scara.com>
Cc: <alsa-devel@alsa-project.org>, <linux-kernel@vger.kernel.org>
Subject: [PATCHv1] ASoC: SGTL5000: Fix kernel failed while getting regulator consumers
Date: Tue, 26 Nov 2013 17:55:13 +0800 [thread overview]
Message-ID: <1385459713-6778-1-git-send-email-Li.Xiubo@freescale.com> (raw)
SGTL5000 codec allows to use the internal LDO instead of VDDD, if the
internal LDO is used, this caused the following kernel failed while trying
to get the external VDDD regulator consumer.
Adding sgtl5000_external_vddd_used() to fix it. And this has been tested on
VF610-TWR board.
sgtl5000 0-000a: Failed to get supply 'VDDD': -19
Signed-off-by: Xiubo Li <Li.Xiubo@freescale.com>
---
sound/soc/codecs/sgtl5000.c | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c
index 1f4093f..1a2d35a 100644
--- a/sound/soc/codecs/sgtl5000.c
+++ b/sound/soc/codecs/sgtl5000.c
@@ -1298,6 +1298,20 @@ static int sgtl5000_replace_vddd_with_ldo(struct snd_soc_codec *codec)
return 0;
}
+static int sgtl5000_external_vddd_used(struct snd_soc_codec *codec)
+{
+ struct regulator *consumer;
+ struct sgtl5000_priv *sgtl5000 = snd_soc_codec_get_drvdata(codec);
+
+ consumer = regulator_get(codec->dev, sgtl5000->supplies[VDDD].supply);
+ if (IS_ERR(consumer)) {
+ return 0;
+ }
+ regulator_put(consumer);
+
+ return 1;
+}
+
static int sgtl5000_enable_regulators(struct snd_soc_codec *codec)
{
int reg;
@@ -1310,9 +1324,7 @@ static int sgtl5000_enable_regulators(struct snd_soc_codec *codec)
for (i = 0; i < ARRAY_SIZE(sgtl5000->supplies); i++)
sgtl5000->supplies[i].supply = supply_names[i];
- ret = regulator_bulk_get(codec->dev, ARRAY_SIZE(sgtl5000->supplies),
- sgtl5000->supplies);
- if (!ret)
+ if (sgtl5000_external_vddd_used(codec))
external_vddd = 1;
else {
ret = sgtl5000_replace_vddd_with_ldo(codec);
--
1.8.4
next reply other threads:[~2013-11-26 10:44 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-26 9:55 Xiubo Li [this message]
2013-11-26 10:59 ` Lothar Waßmann
2013-11-27 4:16 ` Li Xiubo
2013-11-26 13:44 ` Mark Brown
2013-11-27 8:13 ` Li Xiubo
2013-11-27 11:27 ` Mark Brown
2013-11-28 3:31 ` Li Xiubo
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=1385459713-6778-1-git-send-email-Li.Xiubo@freescale.com \
--to=li.xiubo@freescale.com \
--cc=LW@KARO-electronics.de \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=fabio.estevam@freescale.com \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=oskar@scara.com \
--cc=perex@perex.cz \
--cc=tiwai@suse.de \
/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
all inboxes | Powered by JetHome®