diff options
| author | Marek Vasut <[email protected]> | 2019-12-20 17:44:50 +0100 |
|---|---|---|
| committer | Mark Brown <[email protected]> | 2020-01-14 15:54:31 +0000 |
| commit | e19ecbf105b236a6334fab64d8fd5437b12ee019 (patch) | |
| tree | 3bff123bf288daa939399f1b4ba933a02f197176 | |
| parent | aa6dcba83177cf5a96a4ab3b206613d42f8e117b (diff) | |
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")
Signed-off-by: Marek Vasut <[email protected]>
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]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Mark Brown <[email protected]>
| -rw-r--r-- | sound/soc/codecs/sgtl5000.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index aa1f9637d895..e949b372cead 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c @@ -1344,7 +1344,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 (regulator_is_equal(sgtl5000->supplies[VDDA].consumer, + sgtl5000->supplies[VDDIO].consumer)) { lreg_ctrl |= SGTL5000_VDDC_ASSN_OVRD; lreg_ctrl |= SGTL5000_VDDC_MAN_ASSN_VDDIO << SGTL5000_VDDC_MAN_ASSN_SHIFT; |