Merge "ASoC: msm: qdsp6v2: Update routing path for sec MI2S" (ed177079) · Commits · e / devices / android_kernel_xiaomi_markw

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

+20 −0

Original line number	Diff line number	Diff line
		@@ -6344,6 +6344,12 @@ static const struct snd_kcontrol_new sec_i2s_rx_voice_mixer_controls[] = {
		SOC_SINGLE_EXT("QCHAT", MSM_BACKEND_DAI_SEC_I2S_RX,
		MSM_FRONTEND_DAI_QCHAT, 1, 0, msm_routing_get_voice_mixer,
		msm_routing_put_voice_mixer),
		SOC_SINGLE_EXT("VoiceMMode1", MSM_BACKEND_DAI_SECONDARY_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_SECONDARY_MI2S_RX,
		MSM_FRONTEND_DAI_VOICEMMODE2, 1, 0, msm_routing_get_voice_mixer,
		msm_routing_put_voice_mixer),
		};

		static const struct snd_kcontrol_new sec_mi2s_rx_voice_mixer_controls[] = {
		@@ -6368,6 +6374,12 @@ static const struct snd_kcontrol_new sec_mi2s_rx_voice_mixer_controls[] = {
		SOC_SINGLE_EXT("QCHAT", MSM_BACKEND_DAI_SECONDARY_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_SECONDARY_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_SECONDARY_MI2S_RX,
		MSM_FRONTEND_DAI_VOICEMMODE2, 1, 0, msm_routing_get_voice_mixer,
		msm_routing_put_voice_mixer),
		};

		static const struct snd_kcontrol_new slimbus_rx_voice_mixer_controls[] = {
		@@ -7016,6 +7028,9 @@ static const struct snd_kcontrol_new tx_voicemmode1_mixer_controls[] = {
		SOC_SINGLE_EXT("QUAT_TDM_TX_0_MMode1",
		MSM_BACKEND_DAI_QUAT_TDM_TX_0, MSM_FRONTEND_DAI_VOICEMMODE1,
		1, 0, msm_routing_get_voice_mixer, msm_routing_put_voice_mixer),
		SOC_SINGLE_EXT("SEC_MI2S_TX_MMode1",
		MSM_BACKEND_DAI_SECONDARY_MI2S_TX, MSM_FRONTEND_DAI_VOICEMMODE1, 1, 0,
		msm_routing_get_voice_mixer, msm_routing_put_voice_mixer),
		};

		static const struct snd_kcontrol_new tx_voicemmode2_mixer_controls[] = {
		@@ -7046,6 +7061,9 @@ static const struct snd_kcontrol_new tx_voicemmode2_mixer_controls[] = {
		SOC_SINGLE_EXT("TERT_MI2S_TX_MMode2",
		MSM_BACKEND_DAI_TERTIARY_MI2S_TX, MSM_FRONTEND_DAI_VOICEMMODE2,
		1, 0, msm_routing_get_voice_mixer, msm_routing_put_voice_mixer),
		SOC_SINGLE_EXT("SEC_MI2S_TX_MMode2",
		MSM_BACKEND_DAI_SECONDARY_MI2S_TX, MSM_FRONTEND_DAI_VOICEMMODE2, 1, 0,
		msm_routing_get_voice_mixer, msm_routing_put_voice_mixer),
		};

		static const struct snd_kcontrol_new tx_voip_mixer_controls[] = {
		@@ -11965,6 +11983,7 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"VoiceMMode1_Tx Mixer", "AUX_PCM_TX_MMode1", "AUX_PCM_TX"},
		{"VoiceMMode1_Tx Mixer", "SEC_AUX_PCM_TX_MMode1", "SEC_AUX_PCM_TX"},
		{"VoiceMMode1_Tx Mixer", "QUAT_TDM_TX_0_MMode1", "QUAT_TDM_TX_0"},
		{"VoiceMMode1_Tx Mixer", "SEC_MI2S_TX_MMode1", "SEC_MI2S_TX"},
		{"VOICEMMODE1_UL", NULL, "VoiceMMode1_Tx Mixer"},

		{"VoiceMMode2_Tx Mixer", "PRI_TX_MMode2", "PRI_I2S_TX"},
		@@ -11976,6 +11995,7 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"VoiceMMode2_Tx Mixer", "AFE_PCM_TX_MMode2", "PCM_TX"},
		{"VoiceMMode2_Tx Mixer", "AUX_PCM_TX_MMode2", "AUX_PCM_TX"},
		{"VoiceMMode2_Tx Mixer", "SEC_AUX_PCM_TX_MMode2", "SEC_AUX_PCM_TX"},
		{"VoiceMMode2_Tx Mixer", "SEC_MI2S_TX_MMode2", "SEC_MI2S_TX"},
		{"VOICEMMODE2_UL", NULL, "VoiceMMode2_Tx Mixer"},

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