Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit cc0b8139 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/fix/msm8916' into asoc-linus

parents 613733f0 664611e7

sound/soc/codecs/msm8916-wcd-analog.c

+4 −3
Original line number Diff line number Diff line
@@ -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,7 +349,8 @@ static void pm8916_wcd_analog_micbias_enable(struct snd_soc_codec *codec) 
			    | MICB_1_CTL_EXT_PRECHARG_EN_ENABLE);



	if (wcd->micbias_mv) {

		snd_soc_write(codec, CDC_A_MICB_1_VAL,

		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

sound/soc/codecs/msm8916-wcd-digital.c

+2 −2
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ static const struct soc_enum rx_mix2_inp1_chain_enum = SOC_ENUM_SINGLE( 
static const struct soc_enum rx2_mix1_inp_enum[] = {

	SOC_ENUM_SINGLE(LPASS_CDC_CONN_RX2_B1_CTL, 0, 6, rx_mix1_text),

	SOC_ENUM_SINGLE(LPASS_CDC_CONN_RX2_B1_CTL, 3, 6, rx_mix1_text),

	SOC_ENUM_SINGLE(LPASS_CDC_CONN_RX2_B1_CTL, 0, 6, rx_mix1_text),

	SOC_ENUM_SINGLE(LPASS_CDC_CONN_RX2_B2_CTL, 0, 6, rx_mix1_text),

};



/* RX2 MIX2 */
@@ -249,7 +249,7 @@ static const struct soc_enum rx2_mix2_inp1_chain_enum = SOC_ENUM_SINGLE( 
static const struct soc_enum rx3_mix1_inp_enum[] = {

	SOC_ENUM_SINGLE(LPASS_CDC_CONN_RX3_B1_CTL, 0, 6, rx_mix1_text),

	SOC_ENUM_SINGLE(LPASS_CDC_CONN_RX3_B1_CTL, 3, 6, rx_mix1_text),

	SOC_ENUM_SINGLE(LPASS_CDC_CONN_RX3_B1_CTL, 0, 6, rx_mix1_text),

	SOC_ENUM_SINGLE(LPASS_CDC_CONN_RX3_B2_CTL, 0, 6, rx_mix1_text),

};



/* DEC */