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

Commit 3b4aa8f4 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: Route low latency frontend to in-call music backend"

parents 5a701945 69d64a78

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

+8 −0
Original line number Diff line number Diff line
@@ -1722,6 +1722,9 @@ static const struct snd_kcontrol_new incall_music_delivery_mixer_controls[] = { 
	SOC_SINGLE_EXT("MultiMedia2", MSM_BACKEND_DAI_VOICE_PLAYBACK_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA2, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("MultiMedia5", MSM_BACKEND_DAI_VOICE_PLAYBACK_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA5, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("MultiMedia9", MSM_BACKEND_DAI_VOICE_PLAYBACK_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA9, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),
@@ -1734,6 +1737,9 @@ static const struct snd_kcontrol_new incall_music2_delivery_mixer_controls[] = { 
	SOC_SINGLE_EXT("MultiMedia2", MSM_BACKEND_DAI_VOICE2_PLAYBACK_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA2, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("MultiMedia5", MSM_BACKEND_DAI_VOICE2_PLAYBACK_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA5, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("MultiMedia9", MSM_BACKEND_DAI_VOICE2_PLAYBACK_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA9, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),
@@ -3473,10 +3479,12 @@ static const struct snd_soc_dapm_route intercon[] = { 
		/* incall */

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

	{"Incall_Music Audio Mixer", "MultiMedia2", "MM_DL2"},

	{"Incall_Music Audio Mixer", "MultiMedia5", "MM_DL5"},

	{"Incall_Music Audio Mixer", "MultiMedia9", "MM_DL9"},

	{"VOICE_PLAYBACK_TX", NULL, "Incall_Music Audio Mixer"},

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

	{"Incall_Music_2 Audio Mixer", "MultiMedia2", "MM_DL2"},

	{"Incall_Music_2 Audio Mixer", "MultiMedia5", "MM_DL5"},

	{"Incall_Music_2 Audio Mixer", "MultiMedia9", "MM_DL9"},

	{"VOICE2_PLAYBACK_TX", NULL, "Incall_Music_2 Audio Mixer"},

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