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

Commit 85f9df32 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: qdsp6v2: update routing path for MultiMedia5"

parents 418e1dca 32dc20de

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

+4 −0
Original line number Diff line number Diff line
@@ -2622,6 +2622,9 @@ static const struct snd_kcontrol_new mmul5_mixer_controls[] = { 
	SOC_SINGLE_EXT("PRI_MI2S_TX", MSM_BACKEND_DAI_PRI_MI2S_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA5, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("TERT_MI2S_TX", MSM_BACKEND_DAI_TERTIARY_MI2S_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA5, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

};



static const struct snd_kcontrol_new mmul6_mixer_controls[] = {
@@ -4646,6 +4649,7 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"MultiMedia1 Mixer", "PRI_MI2S_TX", "PRI_MI2S_TX"},

	{"MultiMedia6 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},

	{"MultiMedia6 Mixer", "TERT_MI2S_TX", "TERT_MI2S_TX"},

	{"MultiMedia5 Mixer", "TERT_MI2S_TX", "TERT_MI2S_TX"},

	{"MultiMedia6 Mixer", "PRI_MI2S_TX", "PRI_MI2S_TX"},

	{"MultiMedia6 Mixer", "AUX_PCM_UL_TX", "AUX_PCM_TX"},

	{"MultiMedia6 Mixer", "SEC_AUX_PCM_UL_TX", "SEC_AUX_PCM_TX"},