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

Commit 58d06df7 authored by Damir Didjusto's avatar Damir Didjusto
Browse files

ASoC: msm: Add MM6 routing 



Add MM6 routing commands. This will enable to route
data through ASM loopback through MM6. MM6 will be
used to make the connections for the asm loopback.

Change-Id: Ife0e94e6355144ce2ced4a936d946d2bd3973edb
Signed-off-by: default avatarDamir Didjusto <damird@codeaurora.org>
parent 0be40a35

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

+11 −1
Original line number Diff line number Diff line
@@ -2155,6 +2155,12 @@ static const struct snd_kcontrol_new mmul5_mixer_controls[] = { 
	msm_routing_put_audio_mixer),

};



static const struct snd_kcontrol_new mmul6_mixer_controls[] = {

	SOC_SINGLE_EXT("INTERNAL_FM_TX", MSM_BACKEND_DAI_INT_FM_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA6, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

};



static const struct snd_kcontrol_new mmul8_mixer_controls[] = {

	SOC_SINGLE_EXT("SLIM_0_TX", MSM_BACKEND_DAI_SLIMBUS_0_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA8, 1, 0, msm_routing_get_audio_mixer,
@@ -2179,7 +2185,6 @@ static const struct snd_kcontrol_new mmul8_mixer_controls[] = { 
	msm_routing_put_audio_mixer),

};





static const struct snd_kcontrol_new pri_rx_voice_mixer_controls[] = {

	SOC_SINGLE_EXT("CSVoice", MSM_BACKEND_DAI_PRI_I2S_RX,

	MSM_FRONTEND_DAI_CS_VOICE, 1, 0, msm_routing_get_voice_mixer,
@@ -3297,6 +3302,7 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = { 
	SND_SOC_DAPM_AIF_OUT("MM_UL2", "MultiMedia2 Capture", 0, 0, 0, 0),

	SND_SOC_DAPM_AIF_OUT("MM_UL4", "MultiMedia4 Capture", 0, 0, 0, 0),

	SND_SOC_DAPM_AIF_OUT("MM_UL5", "MultiMedia5 Capture", 0, 0, 0, 0),

	SND_SOC_DAPM_AIF_OUT("MM_UL6", "MultiMedia6 Capture", 0, 0, 0, 0),

	SND_SOC_DAPM_AIF_OUT("MM_UL8", "MultiMedia8 Capture", 0, 0, 0, 0),

	SND_SOC_DAPM_AIF_OUT("MM_UL9", "MultiMedia9 Capture", 0, 0, 0, 0),

	SND_SOC_DAPM_AIF_IN("CS-VOICE_DL1", "CS-VOICE Playback", 0, 0, 0, 0),
@@ -3477,6 +3483,8 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = { 
	mmul4_mixer_controls, ARRAY_SIZE(mmul4_mixer_controls)),

	SND_SOC_DAPM_MIXER("MultiMedia5 Mixer", SND_SOC_NOPM, 0, 0,

	mmul5_mixer_controls, ARRAY_SIZE(mmul5_mixer_controls)),

	SND_SOC_DAPM_MIXER("MultiMedia6 Mixer", SND_SOC_NOPM, 0, 0,

	mmul6_mixer_controls, ARRAY_SIZE(mmul6_mixer_controls)),

	SND_SOC_DAPM_MIXER("MultiMedia8 Mixer", SND_SOC_NOPM, 0, 0,

	mmul8_mixer_controls, ARRAY_SIZE(mmul8_mixer_controls)),

	SND_SOC_DAPM_MIXER("AUX_PCM_RX Audio Mixer", SND_SOC_NOPM, 0, 0,
@@ -3783,6 +3791,7 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"MultiMedia1 Mixer", "INTERNAL_FM_TX", "INT_FM_TX"},

	{"MultiMedia4 Mixer", "INTERNAL_FM_TX", "INT_FM_TX"},

	{"MultiMedia5 Mixer", "INTERNAL_FM_TX", "INT_FM_TX"},

	{"MultiMedia6 Mixer", "INTERNAL_FM_TX", "INT_FM_TX"},

	{"MultiMedia8 Mixer", "INTERNAL_FM_TX", "INT_FM_TX"},



	{"MultiMedia1 Mixer", "AFE_PCM_TX", "PCM_TX"},
@@ -3794,6 +3803,7 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"MM_UL2", NULL, "MultiMedia2 Mixer"},

	{"MM_UL4", NULL, "MultiMedia4 Mixer"},

	{"MM_UL5", NULL, "MultiMedia5 Mixer"},

	{"MM_UL6", NULL, "MultiMedia6 Mixer"},

	{"MM_UL8", NULL, "MultiMedia8 Mixer"},



	{"AUX_PCM_RX Audio Mixer", "MultiMedia1", "MM_DL1"},