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

Commit ceee0316 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: qdspv2: Add tertiary MI2S ports support"

parents 4c8b9606 df79ed1d

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

+61 −0
Original line number Diff line number Diff line
@@ -4151,6 +4151,45 @@ static const struct snd_kcontrol_new pri_mi2s_rx_voice_mixer_controls[] = { 
	msm_routing_put_voice_mixer),

};



static const struct snd_kcontrol_new tert_mi2s_rx_voice_mixer_controls[] = {

	SOC_SINGLE_EXT("CSVoice", MSM_BACKEND_DAI_TERTIARY_MI2S_RX,

	MSM_FRONTEND_DAI_CS_VOICE, 1, 0, msm_routing_get_voice_mixer,

	msm_routing_put_voice_mixer),

	SOC_SINGLE_EXT("Voice2", MSM_BACKEND_DAI_TERTIARY_MI2S_RX,

	MSM_FRONTEND_DAI_VOICE2, 1, 0, msm_routing_get_voice_mixer,

	msm_routing_put_voice_mixer),

	SOC_SINGLE_EXT("Voip", MSM_BACKEND_DAI_TERTIARY_MI2S_RX,

	MSM_FRONTEND_DAI_VOIP, 1, 0, msm_routing_get_voice_mixer,

	msm_routing_put_voice_mixer),

	SOC_SINGLE_EXT("Voice Stub", MSM_BACKEND_DAI_TERTIARY_MI2S_RX,

	MSM_FRONTEND_DAI_VOICE_STUB, 1, 0, msm_routing_get_voice_stub_mixer,

	msm_routing_put_voice_stub_mixer),

	SOC_SINGLE_EXT("Voice2 Stub", MSM_BACKEND_DAI_TERTIARY_MI2S_RX,

	MSM_FRONTEND_DAI_VOICE2_STUB, 1, 0, msm_routing_get_voice_stub_mixer,

	msm_routing_put_voice_stub_mixer),

	SOC_SINGLE_EXT("VoLTE", MSM_BACKEND_DAI_TERTIARY_MI2S_RX,

	MSM_FRONTEND_DAI_VOLTE, 1, 0, msm_routing_get_voice_mixer,

	msm_routing_put_voice_mixer),

	SOC_SINGLE_EXT("VoLTE Stub", MSM_BACKEND_DAI_TERTIARY_MI2S_RX,

	MSM_FRONTEND_DAI_VOLTE_STUB, 1, 0, msm_routing_get_voice_mixer,

	msm_routing_put_voice_mixer),

	SOC_SINGLE_EXT("VoWLAN", MSM_BACKEND_DAI_TERTIARY_MI2S_RX,

	MSM_FRONTEND_DAI_VOWLAN, 1, 0, msm_routing_get_voice_mixer,

	msm_routing_put_voice_mixer),

	SOC_SINGLE_EXT("DTMF", MSM_BACKEND_DAI_TERTIARY_MI2S_RX,

	MSM_FRONTEND_DAI_DTMF_RX, 1, 0, msm_routing_get_voice_mixer,

	msm_routing_put_voice_mixer),

	SOC_SINGLE_EXT("QCHAT", MSM_BACKEND_DAI_TERTIARY_MI2S_RX,

	MSM_FRONTEND_DAI_QCHAT, 1, 0, msm_routing_get_voice_mixer,

	msm_routing_put_voice_mixer),

	SOC_SINGLE_EXT("VoiceMMode1", MSM_BACKEND_DAI_TERTIARY_MI2S_RX,

	MSM_FRONTEND_DAI_VOICEMMODE1, 1, 0, msm_routing_get_voice_mixer,

	msm_routing_put_voice_mixer),

	SOC_SINGLE_EXT("VoiceMMode2", MSM_BACKEND_DAI_TERTIARY_MI2S_RX,

	MSM_FRONTEND_DAI_VOICEMMODE2, 1, 0, msm_routing_get_voice_mixer,

	msm_routing_put_voice_mixer),

};



static const struct snd_kcontrol_new quat_mi2s_rx_voice_mixer_controls[] = {

	SOC_SINGLE_EXT("CSVoice", MSM_BACKEND_DAI_QUATERNARY_MI2S_RX,

	MSM_FRONTEND_DAI_CS_VOICE, 1, 0, msm_routing_get_voice_mixer,
@@ -4647,6 +4686,9 @@ static const struct snd_kcontrol_new tx_voice_stub_mixer_controls[] = { 
	SOC_SINGLE_EXT("PRI_MI2S_TX", MSM_BACKEND_DAI_PRI_MI2S_TX,

	MSM_FRONTEND_DAI_VOICE_STUB, 1, 0, msm_routing_get_voice_stub_mixer,

	msm_routing_put_voice_stub_mixer),

	SOC_SINGLE_EXT("TERT_MI2S_TX", MSM_BACKEND_DAI_TERTIARY_MI2S_TX,

	MSM_FRONTEND_DAI_VOICE_STUB, 1, 0, msm_routing_get_voice_stub_mixer,

	msm_routing_put_voice_stub_mixer),

	SOC_SINGLE_EXT("QUAT_MI2S_TX", MSM_BACKEND_DAI_QUATERNARY_MI2S_TX,

	MSM_FRONTEND_DAI_VOICE_STUB, 1, 0, msm_routing_get_voice_stub_mixer,

	msm_routing_put_voice_stub_mixer),
@@ -7154,6 +7196,10 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = { 
				SND_SOC_NOPM, 0, 0,

				pri_mi2s_rx_voice_mixer_controls,

				ARRAY_SIZE(pri_mi2s_rx_voice_mixer_controls)),

	SND_SOC_DAPM_MIXER("TERT_MI2S_RX_Voice Mixer",

				SND_SOC_NOPM, 0, 0,

				tert_mi2s_rx_voice_mixer_controls,

				ARRAY_SIZE(tert_mi2s_rx_voice_mixer_controls)),

	SND_SOC_DAPM_MIXER("QUAT_MI2S_RX_Voice Mixer",

				SND_SOC_NOPM, 0, 0,

				quat_mi2s_rx_voice_mixer_controls,
@@ -8088,6 +8134,20 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"PRI_MI2S_RX_Voice Mixer", "VoiceMMode2", "VOICEMMODE2_DL"},

	{"PRI_MI2S_RX", NULL, "PRI_MI2S_RX_Voice Mixer"},



	{"TERT_MI2S_RX_Voice Mixer", "CSVoice", "CS-VOICE_DL1"},

	{"TERT_MI2S_RX_Voice Mixer", "Voice2", "VOICE2_DL"},

	{"TERT_MI2S_RX_Voice Mixer", "Voip", "VOIP_DL"},

	{"TERT_MI2S_RX_Voice Mixer", "VoLTE", "VoLTE_DL"},

	{"TERT_MI2S_RX_Voice Mixer", "VoWLAN", "VoWLAN_DL"},

	{"TERT_MI2S_RX_Voice Mixer", "VoLTE Stub", "VOLTE_STUB_DL"},

	{"TERT_MI2S_RX_Voice Mixer", "Voice Stub", "VOICE_STUB_DL"},

	{"TERT_MI2S_RX_Voice Mixer", "Voice2 Stub", "VOICE2_STUB_DL"},

	{"TERT_MI2S_RX_Voice Mixer", "QCHAT", "QCHAT_DL"},

	{"TERT_MI2S_RX_Voice Mixer", "DTMF", "DTMF_DL_HL"},

	{"TERT_MI2S_RX_Voice Mixer", "VoiceMMode1", "VOICEMMODE1_DL"},

	{"TERT_MI2S_RX_Voice Mixer", "VoiceMMode2", "VOICEMMODE2_DL"},

	{"TERT_MI2S_RX", NULL, "TERT_MI2S_RX_Voice Mixer"},



	{"QUAT_MI2S_RX_Voice Mixer", "CSVoice", "CS-VOICE_DL1"},

	{"QUAT_MI2S_RX_Voice Mixer", "Voice2", "VOICE2_DL"},

	{"QUAT_MI2S_RX_Voice Mixer", "Voip", "VOIP_DL"},
@@ -8574,6 +8634,7 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"Voice Stub Tx Mixer", "SEC_AUX_PCM_UL_TX", "SEC_AUX_PCM_TX"},

	{"Voice Stub Tx Mixer", "MI2S_TX", "MI2S_TX"},

	{"Voice Stub Tx Mixer", "PRI_MI2S_TX", "PRI_MI2S_TX"},

	{"Voice Stub Tx Mixer", "TERT_MI2S_TX", "TERT_MI2S_TX"},

	{"Voice Stub Tx Mixer", "QUAT_MI2S_TX", "QUAT_MI2S_TX"},

	{"Voice Stub Tx Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},

	{"Voice Stub Tx Mixer", "SLIM_3_TX", "SLIMBUS_3_TX"},