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

Commit ebe9e851 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: wcd9306: Update RX4 mix chain with 3rd input"

parents 4b7853a0 b79924fa

sound/soc/codecs/wcd9306.c

+7 −1
Original line number Diff line number Diff line
@@ -1325,6 +1325,9 @@ static const struct soc_enum rx4_mix1_inp1_chain_enum = 
static const struct soc_enum rx4_mix1_inp2_chain_enum =

	SOC_ENUM_SINGLE(TAPAN_A_CDC_CONN_RX4_B1_CTL, 4, 13, rx_3_4_mix1_text);



static const struct soc_enum rx4_mix1_inp3_chain_enum =

	SOC_ENUM_SINGLE(TAPAN_A_CDC_CONN_RX4_B2_CTL, 0, 13, rx_3_4_mix1_text);



static const struct soc_enum rx1_mix2_inp1_chain_enum =

	SOC_ENUM_SINGLE(TAPAN_A_CDC_CONN_RX1_B3_CTL, 0, 5, rx_mix2_text);
@@ -1420,6 +1423,9 @@ static const struct snd_kcontrol_new rx4_mix1_inp1_mux = 
static const struct snd_kcontrol_new rx4_mix1_inp2_mux =

	SOC_DAPM_ENUM("RX4 MIX1 INP2 Mux", rx4_mix1_inp2_chain_enum);



static const struct snd_kcontrol_new rx4_mix1_inp3_mux =

	SOC_DAPM_ENUM("RX4 MIX1 INP3 Mux", rx4_mix1_inp3_chain_enum);



static const struct snd_kcontrol_new rx1_mix2_inp1_mux =

	SOC_DAPM_ENUM("RX1 MIX2 INP1 Mux", rx1_mix2_inp1_chain_enum);
@@ -4212,7 +4218,7 @@ static const struct snd_soc_dapm_widget tapan_9306_dapm_widgets[] = { 
	SND_SOC_DAPM_MUX("RX4 MIX1 INP2", SND_SOC_NOPM, 0, 0,

		&rx4_mix1_inp2_mux),

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

		&rx4_mix1_inp2_mux),

		&rx4_mix1_inp3_mux),



	/* RX4 MIX2 mux inputs */

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