From f790ed3755c2278ff05273489877c40f237afc22 Mon Sep 17 00:00:00 2001 From: Xing Zheng Date: Thu, 1 Nov 2018 09:42:17 +0800 Subject: [PATCH] ASoC: rk3308_codec: fix LINEOUT VCM POP dues to >0.9V Isolate HPMIX and LINEOUT when disable DAC. Change-Id: I337b77a418a764cc4edb3fc0c3c4696db107cbb8 Signed-off-by: Xing Zheng --- sound/soc/codecs/rk3308_codec.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/rk3308_codec.c b/sound/soc/codecs/rk3308_codec.c index 2e77adef9498..724816ca2a5c 100644 --- a/sound/soc/codecs/rk3308_codec.c +++ b/sound/soc/codecs/rk3308_codec.c @@ -2046,8 +2046,8 @@ static int rk3308_codec_dac_disable(struct rk3308_codec_priv *rk3308) regmap_update_bits(rk3308->regmap, RK3308_DAC_ANA_CON13, RK3308_DAC_L_HPMIX_UNMUTE | RK3308_DAC_R_HPMIX_UNMUTE, - RK3308_DAC_L_HPMIX_MUTE | - RK3308_DAC_R_HPMIX_MUTE); + RK3308_DAC_L_HPMIX_UNMUTE | + RK3308_DAC_R_HPMIX_UNMUTE); /* Step 04 */ regmap_update_bits(rk3308->regmap, RK3308_DAC_ANA_CON12, @@ -2159,8 +2159,8 @@ static int rk3308_codec_dac_disable(struct rk3308_codec_priv *rk3308) regmap_update_bits(rk3308->regmap, RK3308_DAC_ANA_CON13, RK3308_DAC_L_HPMIX_WORK | RK3308_DAC_R_HPMIX_WORK, - RK3308_DAC_L_HPMIX_INIT | - RK3308_DAC_R_HPMIX_INIT); + RK3308_DAC_L_HPMIX_WORK | + RK3308_DAC_R_HPMIX_WORK); /* Step 20 skipped, may set the min gain for HPOUT. */