Skip to contentSkip to conversation

ASoC: sgtl5000: Fix VDDA and VDDIO comparison

PATCH In review Marek Vasut 2 participants 6 messages Dec 19, 2019 – Dec 20, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ASoC: sgtl5000: Fix VDDA and VDDIO comparison

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")
Cc Fabio Estevam <[email protected]>
Cc Igor Opaniuk <[email protected]>
Cc Marcel Ziswiler <[email protected]>
Cc Mark Brown <[email protected]>
Cc Oleksandr Suvorov <[email protected]>
---
 sound/soc/codecs/sgtl5000.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
sound/soc/codecs/sgtl5000.c +4 -1
index 93da6b58c97df..b4568f417d78e 100644
@@ -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;
Signature · 6 lines
2.24.1

_______________________________________________
Alsa-devel mailing list
[email protected]
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
maintainer
#1 lore raw

sound/soc/codecs/sgtl5000.c line 32

Quoted 4 lines · Marek Vasut

#include "sgtl5000.h"

sound/soc/codecs/sgtl5000.c +2 -0
+#include "../../../drivers/regulator/internal.h"
+

This sort of peering inside the internals of the framework is obviously not OK, please add an interface for this if it's needed.

_______________________________________________
Alsa-devel mailing list
[email protected]
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

#2 lore raw
Quoted 9 lines · Mark Brown

sound/soc/codecs/sgtl5000.c line 32

Quoted 4 lines · Marek Vasut

#include "sgtl5000.h"

sound/soc/codecs/sgtl5000.c +2 -0
+#include "../../../drivers/regulator/internal.h"
+

This sort of peering inside the internals of the framework is obviously not OK, please add an interface for this if it's needed.

It's needed, unless there is a better way to compare two regulators in the driver already. Is there ?
_______________________________________________
Alsa-devel mailing list
[email protected]
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

maintainer
#3 lore raw
Quoted 7 lines · Marek Vasut
Quoted 2 lines · Mark Brown

This sort of peering inside the internals of the framework is obviously not OK, please add an interface for this if it's needed.

It's needed, unless there is a better way to compare two regulators in the driver already. Is there ?

Like I said above "please add an interface for this if it's needed".

_______________________________________________
Alsa-devel mailing list
[email protected]
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

#4 lore raw
Quoted 10 lines · Mark Brown
Quoted 7 lines · Marek Vasut
Quoted 2 lines · Mark Brown

This sort of peering inside the internals of the framework is obviously not OK, please add an interface for this if it's needed.

It's needed, unless there is a better way to compare two regulators in the driver already. Is there ?

Like I said above "please add an interface for this if it's needed".

I'm asking whether such a thing exists already :)

If not, then I'll add it in V2.
_______________________________________________
Alsa-devel mailing list
[email protected]
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel