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

Commit d60c6633 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "asoc: Add sources to dai links for concurrent audio record"

parents dcd3cb3d a70027da

asoc/msm-pcm-routing-v2.c

+21 −0
Original line number Diff line number Diff line
@@ -11645,6 +11645,10 @@ static const struct snd_kcontrol_new mmul19_mixer_controls[] = { 
	MSM_BACKEND_DAI_INCALL_RECORD_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA19, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_DOUBLE_EXT("SEC_MI2S_TX", SND_SOC_NOPM,

	MSM_BACKEND_DAI_SECONDARY_MI2S_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA19, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_DOUBLE_EXT("TERT_MI2S_TX", SND_SOC_NOPM,

	MSM_BACKEND_DAI_TERTIARY_MI2S_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA19, 1, 0, msm_routing_get_audio_mixer,
@@ -12127,6 +12131,10 @@ static const struct snd_kcontrol_new mmul28_mixer_controls[] = { 
	MSM_BACKEND_DAI_INCALL_RECORD_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA28, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_DOUBLE_EXT("SEC_MI2S_TX", SND_SOC_NOPM,

	MSM_BACKEND_DAI_SECONDARY_MI2S_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA28, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_DOUBLE_EXT("TERT_MI2S_TX", SND_SOC_NOPM,

	MSM_BACKEND_DAI_TERTIARY_MI2S_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA28, 1, 0, msm_routing_get_audio_mixer,
@@ -12240,6 +12248,10 @@ static const struct snd_kcontrol_new mmul29_mixer_controls[] = { 
	MSM_BACKEND_DAI_INCALL_RECORD_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA29, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_DOUBLE_EXT("SEC_MI2S_TX", SND_SOC_NOPM,

	MSM_BACKEND_DAI_SECONDARY_MI2S_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA29, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_DOUBLE_EXT("TERT_MI2S_TX", SND_SOC_NOPM,

	MSM_BACKEND_DAI_TERTIARY_MI2S_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA29, 1, 0, msm_routing_get_audio_mixer,
@@ -20338,6 +20350,9 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"MultiMedia29 Mixer", "PRI_MI2S_TX", "PRI_MI2S_TX"},

	{"MultiMedia8 Mixer", "PRI_MI2S_TX", "PRI_MI2S_TX"},

	{"MultiMedia18 Mixer", "SEC_MI2S_TX", "SEC_MI2S_TX"},

	{"MultiMedia19 Mixer", "SEC_MI2S_TX", "SEC_MI2S_TX"},

	{"MultiMedia28 Mixer", "SEC_MI2S_TX", "SEC_MI2S_TX"},

	{"MultiMedia29 Mixer", "SEC_MI2S_TX", "SEC_MI2S_TX"},

	{"MultiMedia17 Mixer", "TERT_MI2S_TX", "TERT_MI2S_TX"},

	{"MultiMedia18 Mixer", "TERT_MI2S_TX", "TERT_MI2S_TX"},

	{"MultiMedia19 Mixer", "TERT_MI2S_TX", "TERT_MI2S_TX"},
@@ -20363,7 +20378,13 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"MultiMedia10 Mixer", "SLIM_7_TX", "SLIMBUS_7_TX"},

	{"MultiMedia10 Mixer", "SLIM_9_TX", "SLIMBUS_9_TX"},

	{"MultiMedia18 Mixer", "PRI_SPDIF_TX", "PRI_SPDIF_TX"},

	{"MultiMedia19 Mixer", "PRI_SPDIF_TX", "PRI_SPDIF_TX"},

	{"MultiMedia28 Mixer", "PRI_SPDIF_TX", "PRI_SPDIF_TX"},

	{"MultiMedia29 Mixer", "PRI_SPDIF_TX", "PRI_SPDIF_TX"},

	{"MultiMedia18 Mixer", "SEC_SPDIF_TX", "SEC_SPDIF_TX"},

	{"MultiMedia19 Mixer", "SEC_SPDIF_TX", "SEC_SPDIF_TX"},

	{"MultiMedia28 Mixer", "SEC_SPDIF_TX", "SEC_SPDIF_TX"},

	{"MultiMedia29 Mixer", "SEC_SPDIF_TX", "SEC_SPDIF_TX"},















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















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