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

Commit bcf06677 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: Add TERT_MI2S_TX BE DAI support"

parents dc3274ab 05104c94

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

+21 −1
Original line number Diff line number Diff line
@@ -2224,6 +2224,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("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),

};



static const struct snd_kcontrol_new tx_voice2_mixer_controls[] = {
@@ -2248,6 +2251,9 @@ static const struct snd_kcontrol_new tx_voice2_mixer_controls[] = { 
	SOC_SINGLE_EXT("PRI_MI2S_TX_Voice2", MSM_BACKEND_DAI_PRI_MI2S_TX,

	MSM_FRONTEND_DAI_VOICE2, 1, 0, msm_routing_get_voice_mixer,

	msm_routing_put_voice_mixer),

	SOC_SINGLE_EXT("TERT_MI2S_TX_Voice2", MSM_BACKEND_DAI_TERTIARY_MI2S_TX,

	MSM_FRONTEND_DAI_VOICE2, 1, 0, msm_routing_get_voice_mixer,

	msm_routing_put_voice_mixer),

};



static const struct snd_kcontrol_new tx_volte_mixer_controls[] = {
@@ -2275,6 +2281,9 @@ static const struct snd_kcontrol_new tx_volte_mixer_controls[] = { 
	SOC_SINGLE_EXT("PRI_MI2S_TX_VoLTE", MSM_BACKEND_DAI_PRI_MI2S_TX,

	MSM_FRONTEND_DAI_VOLTE, 1, 0, msm_routing_get_voice_mixer,

	msm_routing_put_voice_mixer),

	SOC_SINGLE_EXT("TERT_MI2S_TX_VoLTE", MSM_BACKEND_DAI_TERTIARY_MI2S_TX,

	MSM_FRONTEND_DAI_VOLTE, 1, 0, msm_routing_get_voice_mixer,

	msm_routing_put_voice_mixer),

};



static const struct snd_kcontrol_new tx_vowlan_mixer_controls[] = {
@@ -2329,6 +2338,9 @@ static const struct snd_kcontrol_new tx_voip_mixer_controls[] = { 
	SOC_SINGLE_EXT("PRI_MI2S_TX_Voip", MSM_BACKEND_DAI_PRI_MI2S_TX,

	MSM_FRONTEND_DAI_VOIP, 1, 0, msm_routing_get_voice_mixer,

	msm_routing_put_voice_mixer),

	SOC_SINGLE_EXT("TERT_MI2S_TX_Voip", MSM_BACKEND_DAI_TERTIARY_MI2S_TX,

	MSM_FRONTEND_DAI_VOIP, 1, 0, msm_routing_get_voice_mixer,

	msm_routing_put_voice_mixer),

};



static const struct snd_kcontrol_new tx_voice_stub_mixer_controls[] = {
@@ -2457,6 +2469,9 @@ static const struct snd_kcontrol_new tx_qchat_mixer_controls[] = { 
	SOC_SINGLE_EXT("PRI_MI2S_TX_QCHAT", MSM_BACKEND_DAI_PRI_MI2S_TX,

	MSM_FRONTEND_DAI_QCHAT, 1, 0, msm_routing_get_voice_mixer,

	msm_routing_put_voice_mixer),

	SOC_SINGLE_EXT("TERT_MI2S_TX_QCHAT", MSM_BACKEND_DAI_TERTIARY_MI2S_TX,

	MSM_FRONTEND_DAI_QCHAT, 1, 0, msm_routing_get_voice_mixer,

	msm_routing_put_voice_mixer),

};



static const struct snd_kcontrol_new sbus_0_rx_port_mixer_controls[] = {
@@ -3678,6 +3693,7 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"Voice_Tx Mixer", "PRI_TX_Voice", "PRI_I2S_TX"},

	{"Voice_Tx Mixer", "PRI_MI2S_TX_Voice", "PRI_MI2S_TX"},

	{"Voice_Tx Mixer", "MI2S_TX_Voice", "MI2S_TX"},

	{"Voice_Tx Mixer", "TERT_MI2S_TX_Voice", "TERT_MI2S_TX"},

	{"Voice_Tx Mixer", "SLIM_0_TX_Voice", "SLIMBUS_0_TX"},

	{"Voice_Tx Mixer", "INTERNAL_BT_SCO_TX_Voice", "INT_BT_SCO_TX"},

	{"Voice_Tx Mixer", "AFE_PCM_TX_Voice", "PCM_TX"},
@@ -3688,6 +3704,7 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"Voice2_Tx Mixer", "PRI_TX_Voice2", "PRI_I2S_TX"},

	{"Voice2_Tx Mixer", "PRI_MI2S_TX_Voice2", "PRI_MI2S_TX"},

	{"Voice2_Tx Mixer", "MI2S_TX_Voice2", "MI2S_TX"},

	{"Voice2_Tx Mixer", "TERT_MI2S_TX_Voice2", "TERT_MI2S_TX"},

	{"Voice2_Tx Mixer", "SLIM_0_TX_Voice2", "SLIMBUS_0_TX"},

	{"Voice2_Tx Mixer", "INTERNAL_BT_SCO_TX_Voice2", "INT_BT_SCO_TX"},

	{"Voice2_Tx Mixer", "AFE_PCM_TX_Voice2", "PCM_TX"},
@@ -3702,6 +3719,7 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"VoLTE_Tx Mixer", "SEC_AUX_PCM_TX_VoLTE", "SEC_AUX_PCM_TX"},

	{"VoLTE_Tx Mixer", "MI2S_TX_VoLTE", "MI2S_TX"},

	{"VoLTE_Tx Mixer", "PRI_MI2S_TX_VoLTE", "PRI_MI2S_TX"},

	{"VoLTE_Tx Mixer", "TERT_MI2S_TX_VoLTE", "TERT_MI2S_TX"},

	{"VoLTE_UL", NULL, "VoLTE_Tx Mixer"},



	{"VoWLAN_Tx Mixer", "PRI_TX_VoWLAN", "PRI_I2S_TX"},
@@ -3716,14 +3734,15 @@ static const struct snd_soc_dapm_route intercon[] = { 


	{"Voip_Tx Mixer", "PRI_TX_Voip", "PRI_I2S_TX"},

	{"Voip_Tx Mixer", "MI2S_TX_Voip", "MI2S_TX"},

	{"Voip_Tx Mixer", "TERT_MI2S_TX_Voip", "TERT_MI2S_TX"},

	{"Voip_Tx Mixer", "SLIM_0_TX_Voip", "SLIMBUS_0_TX"},

	{"Voip_Tx Mixer", "INTERNAL_BT_SCO_TX_Voip", "INT_BT_SCO_TX"},

	{"Voip_Tx Mixer", "AFE_PCM_TX_Voip", "PCM_TX"},

	{"Voip_Tx Mixer", "AUX_PCM_TX_Voip", "AUX_PCM_TX"},

	{"Voip_Tx Mixer", "SEC_AUX_PCM_TX_Voip", "SEC_AUX_PCM_TX"},

	{"Voip_Tx Mixer", "PRI_MI2S_TX_Voip", "PRI_MI2S_TX"},



	{"VOIP_UL", NULL, "Voip_Tx Mixer"},



	{"SLIMBUS_DL_HL", "Switch", "SLIM0_DL_HL"},

	{"SLIMBUS_0_RX", NULL, "SLIMBUS_DL_HL"},

	{"SLIMBUS1_DL_HL", "Switch", "SLIM1_DL_HL"},
@@ -3807,6 +3826,7 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"QCHAT_Tx Mixer", "SEC_AUX_PCM_TX_QCHAT", "SEC_AUX_PCM_TX"},

	{"QCHAT_Tx Mixer", "MI2S_TX_QCHAT", "MI2S_TX"},

	{"QCHAT_Tx Mixer", "PRI_MI2S_TX_QCHAT", "PRI_MI2S_TX"},

	{"QCHAT_Tx Mixer", "TERT_MI2S_TX_QCHAT", "TERT_MI2S_TX"},

	{"QCHAT_UL", NULL, "QCHAT_Tx Mixer"},



	{"INT_FM_RX", NULL, "INTFM_DL_HL"},