summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/rt5651.c
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2018-02-25 11:46:51 +0100
committerMark Brown <broonie@kernel.org>2018-03-01 19:13:04 +0000
commit887fcc6f0514380f17d5016dd8cdfc4d9a4437ee (patch)
treeb006c9f048173592bc34cd6973007d8a0816d0d6 /sound/soc/codecs/rt5651.c
parentbba4e685dae8643469ca6fac22f10ca81554586e (diff)
downloadlinux-887fcc6f0514380f17d5016dd8cdfc4d9a4437ee.tar.gz
linux-887fcc6f0514380f17d5016dd8cdfc4d9a4437ee.tar.bz2
linux-887fcc6f0514380f17d5016dd8cdfc4d9a4437ee.zip
ASoC: rt5651: Do not modify jd and PLL power bits from set_bias_level()
rt5651_set_bias_level(BIAS_OFF) used to unconditionally clear the entire register, including the jack-detect and PLL power bits. When jack-detection support was introduced a special case for jack-detect was added which hard-codes a register value to keep both on. This commit removes the jack-detect special case, instead simply leaving these bits as is on BIAS_OFF. Tested-by: Carlo Caione <carlo@endlessm.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs/rt5651.c')
-rw-r--r--sound/soc/codecs/rt5651.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/sound/soc/codecs/rt5651.c b/sound/soc/codecs/rt5651.c
index c93539ee2200..d4fb16686889 100644
--- a/sound/soc/codecs/rt5651.c
+++ b/sound/soc/codecs/rt5651.c
@@ -1521,8 +1521,6 @@ static int rt5651_set_dai_pll(struct snd_soc_dai *dai, int pll_id, int source,
static int rt5651_set_bias_level(struct snd_soc_component *component,
enum snd_soc_bias_level level)
{
- struct rt5651_priv *rt5651 = snd_soc_component_get_drvdata(component);
-
switch (level) {
case SND_SOC_BIAS_PREPARE:
if (SND_SOC_BIAS_STANDBY == snd_soc_component_get_bias_level(component)) {
@@ -1558,11 +1556,9 @@ static int rt5651_set_bias_level(struct snd_soc_component *component,
/* Do not touch the LDO voltage select bits on bias-off */
snd_soc_component_update_bits(component, RT5651_PWR_ANLG1,
~RT5651_PWR_LDO_DVO_MASK, 0);
- if (rt5651->jd_src) {
- snd_soc_component_write(component, RT5651_PWR_ANLG2, 0x0204);
- } else {
- snd_soc_component_write(component, RT5651_PWR_ANLG2, 0x0000);
- }
+ /* Leave PLL1 and jack-detect power as is, all others off */
+ snd_soc_component_update_bits(component, RT5651_PWR_ANLG2,
+ ~(RT5651_PWR_PLL | RT5651_PWR_JD_M), 0);
break;
default: