linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCHv1] ASoC: SGTL5000: Fix kernel failed while getting regulator consumers
@ 2013-11-26  9:55 Xiubo Li
  2013-11-26 10:59 ` Lothar Waßmann
  2013-11-26 13:44 ` Mark Brown
  0 siblings, 2 replies; 7+ messages in thread
From: Xiubo Li @ 2013-11-26  9:55 UTC (permalink / raw)
  To: lgirdwood, broonie, perex, tiwai, fabio.estevam, LW, oskar
  Cc: alsa-devel, linux-kernel

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



^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2013-11-28  3:33 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-11-26  9:55 [PATCHv1] ASoC: SGTL5000: Fix kernel failed while getting regulator consumers Xiubo Li
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

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).