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

Commit 8461ad40 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "AsoC: Add mixer controls for incall music delivery"

parents 0cbb7f27 b2a024a1

asoc/msm-pcm-routing-v2.c

+5 −0
Original line number Diff line number Diff line
@@ -7607,6 +7607,10 @@ static const struct snd_kcontrol_new incall_music_delivery_mixer_controls[] = { 
	MSM_BACKEND_DAI_VOICE_PLAYBACK_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA2, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_DOUBLE_EXT("MultiMedia4", SND_SOC_NOPM,

	MSM_BACKEND_DAI_VOICE_PLAYBACK_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA4, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_DOUBLE_EXT("MultiMedia5", SND_SOC_NOPM,

	MSM_BACKEND_DAI_VOICE_PLAYBACK_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA5, 1, 0, msm_routing_get_audio_mixer,
@@ -24614,6 +24618,7 @@ 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", "MultiMedia4", "MM_DL4"},

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

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

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