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

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

Merge "ASoC: msm: qdsp6v2: add route for SEC MI2S Tx voice"

parents bbef055c 61ef7ead

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

+4 −0
Original line number Diff line number Diff line
@@ -4263,6 +4263,9 @@ static const struct snd_kcontrol_new tx_voice_mixer_controls[] = { 
	SOC_SINGLE_EXT("PRI_MI2S_TX_Voice", MSM_BACKEND_DAI_PRI_MI2S_TX,

	MSM_FRONTEND_DAI_CS_VOICE, 1, 0, msm_routing_get_voice_mixer,

	msm_routing_put_voice_mixer),

	SOC_SINGLE_EXT("SEC_MI2S_TX_Voice", MSM_BACKEND_DAI_SECONDARY_MI2S_TX,

	MSM_FRONTEND_DAI_CS_VOICE, 1, 0, msm_routing_get_voice_mixer,

	msm_routing_put_voice_mixer),

	SOC_SINGLE_EXT("TERT_MI2S_TX_Voice", MSM_BACKEND_DAI_TERTIARY_MI2S_TX,

	MSM_FRONTEND_DAI_CS_VOICE, 1, 0, msm_routing_get_voice_mixer,

	msm_routing_put_voice_mixer),
@@ -7907,6 +7910,7 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"Voice_Tx Mixer", "AFE_PCM_TX_Voice", "PCM_TX"},

	{"Voice_Tx Mixer", "AUX_PCM_TX_Voice", "AUX_PCM_TX"},

	{"Voice_Tx Mixer", "SEC_AUX_PCM_TX_Voice", "SEC_AUX_PCM_TX"},

	{"Voice_Tx Mixer", "SEC_MI2S_TX_Voice", "SEC_MI2S_TX"},

	{"CS-VOICE_UL1", NULL, "Voice_Tx Mixer"},



	{"Voice2_Tx Mixer", "PRI_TX_Voice2", "PRI_I2S_TX"},