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

Commit 2d309c6f 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 routing for asm loopback on I2S and AUXPCM interfaces"

parents c36d16b6 d0f93eb2

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

+9 −0
Original line number Diff line number Diff line
@@ -2269,6 +2269,12 @@ static const struct snd_kcontrol_new mmul6_mixer_controls[] = { 
	SOC_SINGLE_EXT("TERT_MI2S_TX", MSM_BACKEND_DAI_TERTIARY_MI2S_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA6, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("PRI_MI2S_TX", MSM_BACKEND_DAI_PRI_MI2S_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA6, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("AUX_PCM_UL_TX", MSM_BACKEND_DAI_AUXPCM_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA6, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

};



static const struct snd_kcontrol_new mmul8_mixer_controls[] = {
@@ -4089,6 +4095,7 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"PRI_MI2S_RX Audio Mixer", "MultiMedia3", "MM_DL3"},

	{"PRI_MI2S_RX Audio Mixer", "MultiMedia4", "MM_DL4"},

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

	{"PRI_MI2S_RX Audio Mixer", "MultiMedia6", "MM_DL6"},

	{"PRI_MI2S_RX Audio Mixer", "MultiMedia7", "MM_DL7"},

	{"PRI_MI2S_RX Audio Mixer", "MultiMedia10", "MM_DL10"},

	{"PRI_MI2S_RX Audio Mixer", "MultiMedia11", "MM_DL11"},
@@ -4115,6 +4122,8 @@ 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"},

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

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



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

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