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

Commit 511cb962 authored by Gopikrishnaiah Anandan's avatar Gopikrishnaiah Anandan Committed by Stephen Boyd
Browse files

ASoC: wcd9306: Fix for audio recording 



If multiple mixer widgtes share the same kcontrol,ASoC framework
will create common controls. For audio capture usecase we need
each AIF cap mixer widget to have its own control.
Change creates control for each of the AIF capture mixer widgets.

Signed-off-by: default avatarGopikrishnaiah Anandan <agopik@codeaurora.org>
parent 008aeacb

sound/soc/codecs/wcd9306.c

+30 −4
Original line number Original line Diff line number Diff line
@@ -1697,7 +1697,33 @@ static const struct snd_kcontrol_new slim_rx_mux[TAPAN_RX_MAX] = { 
			  slim_rx_mux_get, slim_rx_mux_put),

			  slim_rx_mux_get, slim_rx_mux_put),

};

};





static const struct snd_kcontrol_new aif_cap_mixer[] = {

static const struct snd_kcontrol_new aif1_cap_mixer[] = {

	SOC_SINGLE_EXT("SLIM TX1", SND_SOC_NOPM, TAPAN_TX1, 1, 0,

			slim_tx_mixer_get, slim_tx_mixer_put),

	SOC_SINGLE_EXT("SLIM TX2", SND_SOC_NOPM, TAPAN_TX2, 1, 0,

			slim_tx_mixer_get, slim_tx_mixer_put),

	SOC_SINGLE_EXT("SLIM TX3", SND_SOC_NOPM, TAPAN_TX3, 1, 0,

			slim_tx_mixer_get, slim_tx_mixer_put),

	SOC_SINGLE_EXT("SLIM TX4", SND_SOC_NOPM, TAPAN_TX4, 1, 0,

			slim_tx_mixer_get, slim_tx_mixer_put),

	SOC_SINGLE_EXT("SLIM TX5", SND_SOC_NOPM, TAPAN_TX5, 1, 0,

			slim_tx_mixer_get, slim_tx_mixer_put),

};



static const struct snd_kcontrol_new aif2_cap_mixer[] = {

	SOC_SINGLE_EXT("SLIM TX1", SND_SOC_NOPM, TAPAN_TX1, 1, 0,

			slim_tx_mixer_get, slim_tx_mixer_put),

	SOC_SINGLE_EXT("SLIM TX2", SND_SOC_NOPM, TAPAN_TX2, 1, 0,

			slim_tx_mixer_get, slim_tx_mixer_put),

	SOC_SINGLE_EXT("SLIM TX3", SND_SOC_NOPM, TAPAN_TX3, 1, 0,

			slim_tx_mixer_get, slim_tx_mixer_put),

	SOC_SINGLE_EXT("SLIM TX4", SND_SOC_NOPM, TAPAN_TX4, 1, 0,

			slim_tx_mixer_get, slim_tx_mixer_put),

	SOC_SINGLE_EXT("SLIM TX5", SND_SOC_NOPM, TAPAN_TX5, 1, 0,

			slim_tx_mixer_get, slim_tx_mixer_put),

};



static const struct snd_kcontrol_new aif3_cap_mixer[] = {

	SOC_SINGLE_EXT("SLIM TX1", SND_SOC_NOPM, TAPAN_TX1, 1, 0,

	SOC_SINGLE_EXT("SLIM TX1", SND_SOC_NOPM, TAPAN_TX1, 1, 0,

			slim_tx_mixer_get, slim_tx_mixer_put),

			slim_tx_mixer_get, slim_tx_mixer_put),

	SOC_SINGLE_EXT("SLIM TX2", SND_SOC_NOPM, TAPAN_TX2, 1, 0,

	SOC_SINGLE_EXT("SLIM TX2", SND_SOC_NOPM, TAPAN_TX2, 1, 0,
@@ -4242,13 +4268,13 @@ static const struct snd_soc_dapm_widget tapan_common_dapm_widgets[] = { 




	/* TX Path*/

	/* TX Path*/

	SND_SOC_DAPM_MIXER("AIF1_CAP Mixer", SND_SOC_NOPM, AIF1_CAP, 0,

	SND_SOC_DAPM_MIXER("AIF1_CAP Mixer", SND_SOC_NOPM, AIF1_CAP, 0,

		aif_cap_mixer, ARRAY_SIZE(aif_cap_mixer)),

		aif1_cap_mixer, ARRAY_SIZE(aif1_cap_mixer)),





	SND_SOC_DAPM_MIXER("AIF2_CAP Mixer", SND_SOC_NOPM, AIF2_CAP, 0,

	SND_SOC_DAPM_MIXER("AIF2_CAP Mixer", SND_SOC_NOPM, AIF2_CAP, 0,

		aif_cap_mixer, ARRAY_SIZE(aif_cap_mixer)),

		aif2_cap_mixer, ARRAY_SIZE(aif2_cap_mixer)),





	SND_SOC_DAPM_MIXER("AIF3_CAP Mixer", SND_SOC_NOPM, AIF3_CAP, 0,

	SND_SOC_DAPM_MIXER("AIF3_CAP Mixer", SND_SOC_NOPM, AIF3_CAP, 0,

		aif_cap_mixer, ARRAY_SIZE(aif_cap_mixer)),

		aif3_cap_mixer, ARRAY_SIZE(aif3_cap_mixer)),





	SND_SOC_DAPM_MUX("SLIM TX1 MUX", SND_SOC_NOPM, TAPAN_TX1, 0,

	SND_SOC_DAPM_MUX("SLIM TX1 MUX", SND_SOC_NOPM, TAPAN_TX1, 0,

		&sb_tx1_mux),

		&sb_tx1_mux),