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

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

ASoC: msm: qdsp6v2: Update kcontrols for loopback 



ASoC framework in kernel 3.10 will create common controls
for widgets that use same kcontrol structure.
Requirement for loopback uses is to have control for each
widget.Change adds kcontrols for individual widgets.

Change-Id: I0209480f15db8a306a529612649ad36f0b723bb9
Signed-off-by: default avatarGopikrishnaiah Anandan <agopik@codeaurora.org>
parent ece18190

sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c

+20 −5
Original line number Diff line number Diff line
@@ -2501,7 +2501,22 @@ static const struct snd_kcontrol_new primary_mi2s_rx_port_mixer_controls[] = { 
	msm_routing_put_port_mixer),

};



static const struct snd_kcontrol_new fm_switch_mixer_controls =

static const struct snd_kcontrol_new slim_fm_switch_mixer_controls =

	SOC_SINGLE_EXT("Switch", SND_SOC_NOPM,

	0, 1, 0, msm_routing_get_switch_mixer,

	msm_routing_put_switch_mixer);



static const struct snd_kcontrol_new slim1_fm_switch_mixer_controls =

	SOC_SINGLE_EXT("Switch", SND_SOC_NOPM,

	0, 1, 0, msm_routing_get_switch_mixer,

	msm_routing_put_switch_mixer);



static const struct snd_kcontrol_new slim3_fm_switch_mixer_controls =

	SOC_SINGLE_EXT("Switch", SND_SOC_NOPM,

	0, 1, 0, msm_routing_get_switch_mixer,

	msm_routing_put_switch_mixer);



static const struct snd_kcontrol_new slim4_fm_switch_mixer_controls =

	SOC_SINGLE_EXT("Switch", SND_SOC_NOPM,

	0, 1, 0, msm_routing_get_switch_mixer,

	msm_routing_put_switch_mixer);
@@ -3195,13 +3210,13 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = { 


	/* Switch Definitions */

	SND_SOC_DAPM_SWITCH("SLIMBUS_DL_HL", SND_SOC_NOPM, 0, 0,

				&fm_switch_mixer_controls),

				&slim_fm_switch_mixer_controls),

	SND_SOC_DAPM_SWITCH("SLIMBUS1_DL_HL", SND_SOC_NOPM, 0, 0,

				&fm_switch_mixer_controls),

				&slim1_fm_switch_mixer_controls),

	SND_SOC_DAPM_SWITCH("SLIMBUS3_DL_HL", SND_SOC_NOPM, 0, 0,

				&fm_switch_mixer_controls),

				&slim3_fm_switch_mixer_controls),

	SND_SOC_DAPM_SWITCH("SLIMBUS4_DL_HL", SND_SOC_NOPM, 0, 0,

				&fm_switch_mixer_controls),

				&slim4_fm_switch_mixer_controls),

	SND_SOC_DAPM_SWITCH("PCM_RX_DL_HL", SND_SOC_NOPM, 0, 0,

				&pcm_rx_switch_mixer_controls),