From: Marek Vasut <marex@denx.de>
To: alsa-devel@alsa-project.org
Cc: Marek Vasut <marex@denx.de>,
Igor Opaniuk <igor.opaniuk@toradex.com>,
Marcel Ziswiler <marcel.ziswiler@toradex.com>,
Oleksandr Suvorov <oleksandr.suvorov@toradex.com>,
Mark Brown <broonie@kernel.org>,
festevam@gmail.com
Subject: [alsa-devel] [PATCH] ASoC: sgtl5000: Fix VDDA and VDDIO comparison
Date: Thu, 19 Dec 2019 22:32:57 +0100 [thread overview]
Message-ID: <20191219213257.366145-1-marex@denx.de> (raw)
Comparing the voltage of VDDA and VDDIO to determine whether or not to
enable VDDC manual override is insufficient. This is a problem in case
the VDDA is supplied from different regulator than VDDIO, while both
report the same voltage to the regulator framework. In that case where
VDDA and VDDIO is supplied by different regulators, the VDDC manual
override must not be applied.
Fixes: b6319b061ba2 ("ASoC: sgtl5000: Fix charge pump source assignment")
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <festevam@gmail.com>
Cc: Igor Opaniuk <igor.opaniuk@toradex.com>
Cc: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
---
sound/soc/codecs/sgtl5000.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c
index 93da6b58c97df..b4568f417d78e 100644
--- a/sound/soc/codecs/sgtl5000.c
+++ b/sound/soc/codecs/sgtl5000.c
@@ -28,6 +28,8 @@
#include "sgtl5000.h"
+#include "../../../drivers/regulator/internal.h"
+
#define SGTL5000_DAP_REG_OFFSET 0x0100
#define SGTL5000_MAX_REG_OFFSET 0x013A
@@ -1344,7 +1346,8 @@ static int sgtl5000_set_power_regs(struct snd_soc_component *component)
* if vddio == vdda the source of charge pump should be
* assigned manually to VDDIO
*/
- if (vddio == vdda) {
+ if (sgtl5000->supplies[VDDA].consumer->rdev ==
+ sgtl5000->supplies[VDDIO].consumer->rdev) {
lreg_ctrl |= SGTL5000_VDDC_ASSN_OVRD;
lreg_ctrl |= SGTL5000_VDDC_MAN_ASSN_VDDIO <<
SGTL5000_VDDC_MAN_ASSN_SHIFT;
--
2.24.1
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
next reply other threads:[~2019-12-19 21:34 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-19 21:32 Marek Vasut [this message]
2019-12-20 13:00 ` [alsa-devel] [PATCH] ASoC: sgtl5000: Fix VDDA and VDDIO comparison Mark Brown
2019-12-20 13:01 ` Marek Vasut
2019-12-20 13:02 ` Mark Brown
2019-12-20 13:10 ` Marek Vasut
2019-12-20 16:01 ` 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=20191219213257.366145-1-marex@denx.de \
--to=marex@denx.de \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=festevam@gmail.com \
--cc=igor.opaniuk@toradex.com \
--cc=marcel.ziswiler@toradex.com \
--cc=oleksandr.suvorov@toradex.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