Skip to contentSkip to conversation

Patch "ASoC: codecs: msm8916-wcd-analog: fix micbias level" has been added to the 4.14-stable tree

PATCH [email protected] 1 participant 1 message Dec 20, 2017

Subsystems (4)
Stable branch Sound ASoC Qualcomm audio (ASoC) drivers
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

ASoC: codecs: msm8916-wcd-analog: fix micbias level

to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
asoc-codecs-msm8916-wcd-analog-fix-micbias-level.patch
and it can be found in the queue-4.14 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From foo@baz Wed Dec 20 18:17:52 CET 2017

From: Jean-Fran�ois T�tu <[email protected]>
Date: Fri, 29 Sep 2017 16:19:44 -0400
Subject: ASoC: codecs: msm8916-wcd-analog: fix micbias level

From: Jean-Fran�ois T�tu <[email protected]>

[ Upstream commit 664611e7e02f76fbc5470ef545b2657ed25c292b ]

The macro used to set the microphone bias level causes the snd_soc_write() call to overwrite other fields in the CDC_A_MICB_1_VAL register. The macro also does not return the proper level value to use. This fixes this by preserving all bits from the register that are not the level while setting the level.

Signed-off-by Jean-François Têtu <[email protected]>
Acked-by Srinivas Kandagatla <[email protected]>
Signed-off-by Mark Brown <[email protected]>
Signed-off-by Sasha Levin <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 sound/soc/codecs/msm8916-wcd-analog.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
sound/soc/codecs/msm8916-wcd-analog.c +4 -3
@@ -104,7 +104,7 @@
 #define CDC_A_MICB_1_VAL		(0xf141)
 #define MICB_MIN_VAL 1600
 #define MICB_STEP_SIZE 50
-#define MICB_VOLTAGE_REGVAL(v)		((v - MICB_MIN_VAL)/MICB_STEP_SIZE)
+#define MICB_VOLTAGE_REGVAL(v)		(((v - MICB_MIN_VAL)/MICB_STEP_SIZE) << 3)
 #define MICB_1_VAL_MICB_OUT_VAL_MASK	GENMASK(7, 3)
 #define MICB_1_VAL_MICB_OUT_VAL_V2P70V	((0x16)  << 3)
 #define MICB_1_VAL_MICB_OUT_VAL_V1P80V	((0x4)  << 3)

@@ -349,8 +349,9 @@ static void pm8916_wcd_analog_micbias_en
 			    | MICB_1_CTL_EXT_PRECHARG_EN_ENABLE);
 
 	if (wcd->micbias_mv) {
-		snd_soc_write(codec, CDC_A_MICB_1_VAL,
-			      MICB_VOLTAGE_REGVAL(wcd->micbias_mv));
+		snd_soc_update_bits(codec, CDC_A_MICB_1_VAL,
+				    MICB_1_VAL_MICB_OUT_VAL_MASK,
+				    MICB_VOLTAGE_REGVAL(wcd->micbias_mv));
 		/*
 		 * Special headset needs MICBIAS as 2.7V so wait for
 		 * 50 msec for the MICBIAS to reach 2.7 volts.

Patches currently in stable-queue which might be from [email protected] are

queue-4.14/asoc-codecs-msm8916-wcd-analog-fix-micbias-level.patch