Merge "ASoC: msm: fix RX3 MIX1 INP3 path setting" (85b3499b) · Commits · e / devices / android_kernel_sony_msm8994

sound/soc/codecs/wcd9306.c

+7 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1346,6 +1346,9 @@ static const struct soc_enum rx3_mix1_inp1_chain_enum =
	static const struct soc_enum rx3_mix1_inp2_chain_enum =		static const struct soc_enum rx3_mix1_inp2_chain_enum =
	SOC_ENUM_SINGLE(TAPAN_A_CDC_CONN_RX3_B1_CTL, 4, 13, rx_3_4_mix1_text);		SOC_ENUM_SINGLE(TAPAN_A_CDC_CONN_RX3_B1_CTL, 4, 13, rx_3_4_mix1_text);

			static const struct soc_enum rx3_mix1_inp3_chain_enum =
			SOC_ENUM_SINGLE(TAPAN_A_CDC_CONN_RX3_B2_CTL, 0, 13, rx_3_4_mix1_text);

	static const struct soc_enum rx4_mix1_inp1_chain_enum =		static const struct soc_enum rx4_mix1_inp1_chain_enum =
	SOC_ENUM_SINGLE(TAPAN_A_CDC_CONN_RX4_B1_CTL, 0, 13, rx_3_4_mix1_text);		SOC_ENUM_SINGLE(TAPAN_A_CDC_CONN_RX4_B1_CTL, 0, 13, rx_3_4_mix1_text);

	@@ -1444,6 +1447,9 @@ static const struct snd_kcontrol_new rx3_mix1_inp1_mux =
	static const struct snd_kcontrol_new rx3_mix1_inp2_mux =		static const struct snd_kcontrol_new rx3_mix1_inp2_mux =
	SOC_DAPM_ENUM("RX3 MIX1 INP2 Mux", rx3_mix1_inp2_chain_enum);		SOC_DAPM_ENUM("RX3 MIX1 INP2 Mux", rx3_mix1_inp2_chain_enum);

			static const struct snd_kcontrol_new rx3_mix1_inp3_mux =
			SOC_DAPM_ENUM("RX3 MIX1 INP3 Mux", rx3_mix1_inp3_chain_enum);

	static const struct snd_kcontrol_new rx4_mix1_inp1_mux =		static const struct snd_kcontrol_new rx4_mix1_inp1_mux =
	SOC_DAPM_ENUM("RX4 MIX1 INP1 Mux", rx4_mix1_inp1_chain_enum);		SOC_DAPM_ENUM("RX4 MIX1 INP1 Mux", rx4_mix1_inp1_chain_enum);

	@@ -4548,7 +4554,7 @@ static const struct snd_soc_dapm_widget tapan_common_dapm_widgets[] = {
	SND_SOC_DAPM_MUX("RX3 MIX1 INP2", SND_SOC_NOPM, 0, 0,		SND_SOC_DAPM_MUX("RX3 MIX1 INP2", SND_SOC_NOPM, 0, 0,
	&rx3_mix1_inp2_mux),		&rx3_mix1_inp2_mux),
	SND_SOC_DAPM_MUX("RX3 MIX1 INP3", SND_SOC_NOPM, 0, 0,		SND_SOC_DAPM_MUX("RX3 MIX1 INP3", SND_SOC_NOPM, 0, 0,
	&rx3_mix1_inp2_mux),		&rx3_mix1_inp3_mux),

	/* RX1 MIX2 mux inputs */		/* RX1 MIX2 mux inputs */
	SND_SOC_DAPM_MUX("RX1 MIX2 INP1", SND_SOC_NOPM, 0, 0,		SND_SOC_DAPM_MUX("RX1 MIX2 INP1", SND_SOC_NOPM, 0, 0,