Unverified Commit bcab0588 authored by Srinivas Kandagatla's avatar Srinivas Kandagatla Committed by Mark Brown
Browse files

ASoC: msm8916-wcd-digital: add missing MIX2 path for RX1/2 



This patch adds missing MIX2 path on RX1/2 which take IIR1 and
IIR2 as inputs.

Without this patch sound card fails to intialize with below warning:

 ASoC: no sink widget found for RX1 MIX2 INP1
 ASoC: Failed to add route IIR1 -> IIR1 -> RX1 MIX2 INP1
 ASoC: no sink widget found for RX2 MIX2 INP1
 ASoC: Failed to add route IIR1 -> IIR1 -> RX2 MIX2 INP1
 ASoC: no sink widget found for RX1 MIX2 INP1
 ASoC: Failed to add route IIR2 -> IIR2 -> RX1 MIX2 INP1
 ASoC: no sink widget found for RX2 MIX2 INP1
 ASoC: Failed to add route IIR2 -> IIR2 -> RX2 MIX2 INP1

Reported-by: default avatarStephan Gerhold <stephan@gerhold.net>
Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Tested-by: default avatarStephan Gerhold <stephan@gerhold.net>
Link: https://lore.kernel.org/r/20191009111944.28069-1-srinivas.kandagatla@linaro.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 0632fa04

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

+22 −0
Original line number Diff line number Diff line
@@ -243,6 +243,10 @@ static const char *const rx_mix1_text[] = { 
	"ZERO", "IIR1", "IIR2", "RX1", "RX2", "RX3"

};



static const char * const rx_mix2_text[] = {

	"ZERO", "IIR1", "IIR2"

};



static const char *const dec_mux_text[] = {

	"ZERO", "ADC1", "ADC2", "ADC3", "DMIC1", "DMIC2"

};
@@ -270,6 +274,16 @@ static const struct soc_enum rx3_mix1_inp_enum[] = { 
	SOC_ENUM_SINGLE(LPASS_CDC_CONN_RX3_B2_CTL, 0, 6, rx_mix1_text),

};



/* RX1 MIX2 */

static const struct soc_enum rx_mix2_inp1_chain_enum =

	SOC_ENUM_SINGLE(LPASS_CDC_CONN_RX1_B3_CTL,

		0, 3, rx_mix2_text);



/* RX2 MIX2 */

static const struct soc_enum rx2_mix2_inp1_chain_enum =

	SOC_ENUM_SINGLE(LPASS_CDC_CONN_RX2_B3_CTL,

		0, 3, rx_mix2_text);



/* DEC */

static const struct soc_enum dec1_mux_enum = SOC_ENUM_SINGLE(

				LPASS_CDC_CONN_TX_B1_CTL, 0, 6, dec_mux_text);
@@ -309,6 +323,10 @@ static const struct snd_kcontrol_new rx3_mix1_inp2_mux = SOC_DAPM_ENUM( 
				"RX3 MIX1 INP2 Mux", rx3_mix1_inp_enum[1]);

static const struct snd_kcontrol_new rx3_mix1_inp3_mux = SOC_DAPM_ENUM(

				"RX3 MIX1 INP3 Mux", rx3_mix1_inp_enum[2]);

static const struct snd_kcontrol_new rx1_mix2_inp1_mux = SOC_DAPM_ENUM(

				"RX1 MIX2 INP1 Mux", rx_mix2_inp1_chain_enum);

static const struct snd_kcontrol_new rx2_mix2_inp1_mux = SOC_DAPM_ENUM(

				"RX2 MIX2 INP1 Mux", rx2_mix2_inp1_chain_enum);



/* Digital Gain control -38.4 dB to +38.4 dB in 0.3 dB steps */

static const DECLARE_TLV_DB_SCALE(digital_gain, -3840, 30, 0);
@@ -740,6 +758,10 @@ static const struct snd_soc_dapm_widget msm8916_wcd_digital_dapm_widgets[] = { 
			 &rx3_mix1_inp2_mux),

	SND_SOC_DAPM_MUX("RX3 MIX1 INP3", SND_SOC_NOPM, 0, 0,

			 &rx3_mix1_inp3_mux),

	SND_SOC_DAPM_MUX("RX1 MIX2 INP1", SND_SOC_NOPM, 0, 0,

			 &rx1_mix2_inp1_mux),

	SND_SOC_DAPM_MUX("RX2 MIX2 INP1", SND_SOC_NOPM, 0, 0,

			 &rx2_mix2_inp1_mux),



	SND_SOC_DAPM_MUX("CIC1 MUX", SND_SOC_NOPM, 0, 0, &cic1_mux),

	SND_SOC_DAPM_MUX("CIC2 MUX", SND_SOC_NOPM, 0, 0, &cic2_mux),

CRA Git | Maintained and supported by SUSTech CRA and CCSE