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

Commit 141c3303 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: add route for TERT_TDM_RX_4 playback"

parents f764ec58 154c0852

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

+73 −0
Original line number Diff line number Diff line
@@ -4341,6 +4341,57 @@ static const struct snd_kcontrol_new tert_tdm_rx_3_mixer_controls[] = { 
	msm_routing_put_audio_mixer),

};



static const struct snd_kcontrol_new tert_tdm_rx_4_mixer_controls[] = {

	SOC_SINGLE_EXT("MultiMedia1", MSM_BACKEND_DAI_TERT_TDM_RX_4,

	MSM_FRONTEND_DAI_MULTIMEDIA1, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("MultiMedia2", MSM_BACKEND_DAI_TERT_TDM_RX_4,

	MSM_FRONTEND_DAI_MULTIMEDIA2, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("MultiMedia3", MSM_BACKEND_DAI_TERT_TDM_RX_4,

	MSM_FRONTEND_DAI_MULTIMEDIA3, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("MultiMedia4", MSM_BACKEND_DAI_TERT_TDM_RX_4,

	MSM_FRONTEND_DAI_MULTIMEDIA4, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("MultiMedia5", MSM_BACKEND_DAI_TERT_TDM_RX_4,

	MSM_FRONTEND_DAI_MULTIMEDIA5, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("MultiMedia6", MSM_BACKEND_DAI_TERT_TDM_RX_4,

	MSM_FRONTEND_DAI_MULTIMEDIA6, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("MultiMedia7", MSM_BACKEND_DAI_TERT_TDM_RX_4,

	MSM_FRONTEND_DAI_MULTIMEDIA7, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("MultiMedia8", MSM_BACKEND_DAI_TERT_TDM_RX_4,

	MSM_FRONTEND_DAI_MULTIMEDIA8, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("MultiMedia9", MSM_BACKEND_DAI_TERT_TDM_RX_4,

	MSM_FRONTEND_DAI_MULTIMEDIA9, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("MultiMedia10", MSM_BACKEND_DAI_TERT_TDM_RX_4,

	MSM_FRONTEND_DAI_MULTIMEDIA10, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("MultiMedia11", MSM_BACKEND_DAI_TERT_TDM_RX_4,

	MSM_FRONTEND_DAI_MULTIMEDIA11, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("MultiMedia12", MSM_BACKEND_DAI_TERT_TDM_RX_4,

	MSM_FRONTEND_DAI_MULTIMEDIA12, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("MultiMedia13", MSM_BACKEND_DAI_TERT_TDM_RX_4,

	MSM_FRONTEND_DAI_MULTIMEDIA13, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("MultiMedia14", MSM_BACKEND_DAI_TERT_TDM_RX_4,

	MSM_FRONTEND_DAI_MULTIMEDIA14, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("MultiMedia15", MSM_BACKEND_DAI_TERT_TDM_RX_4,

	MSM_FRONTEND_DAI_MULTIMEDIA15, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("MultiMedia16", MSM_BACKEND_DAI_TERT_TDM_RX_4,

	MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

};



static const struct snd_kcontrol_new quat_tdm_rx_0_mixer_controls[] = {

	SOC_SINGLE_EXT("MultiMedia1", MSM_BACKEND_DAI_QUAT_TDM_RX_0 ,

	MSM_FRONTEND_DAI_MULTIMEDIA1, 1, 0, msm_routing_get_audio_mixer,
@@ -9299,6 +9350,9 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = { 
	SND_SOC_DAPM_MIXER("TERT_TDM_RX_3 Audio Mixer", SND_SOC_NOPM, 0, 0,

				tert_tdm_rx_3_mixer_controls,

				ARRAY_SIZE(tert_tdm_rx_3_mixer_controls)),

	SND_SOC_DAPM_MIXER("TERT_TDM_RX_4 Audio Mixer", SND_SOC_NOPM, 0, 0,

				tert_tdm_rx_4_mixer_controls,

				ARRAY_SIZE(tert_tdm_rx_4_mixer_controls)),

	SND_SOC_DAPM_MIXER("QUAT_TDM_RX_0 Audio Mixer", SND_SOC_NOPM, 0, 0,

				quat_tdm_rx_0_mixer_controls,

				ARRAY_SIZE(quat_tdm_rx_0_mixer_controls)),
@@ -10094,6 +10148,24 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"TERT_TDM_RX_3 Audio Mixer", "MultiMedia16", "MM_DL16"},

	{"TERT_TDM_RX_3", NULL, "TERT_TDM_RX_3 Audio Mixer"},



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

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

	{"TERT_TDM_RX_4 Audio Mixer", "MultiMedia3", "MM_DL3"},

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

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

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

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

	{"TERT_TDM_RX_4 Audio Mixer", "MultiMedia8", "MM_DL8"},

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

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

	{"TERT_TDM_RX_4 Audio Mixer", "MultiMedia11", "MM_DL11"},

	{"TERT_TDM_RX_4 Audio Mixer", "MultiMedia12", "MM_DL12"},

	{"TERT_TDM_RX_4 Audio Mixer", "MultiMedia13", "MM_DL13"},

	{"TERT_TDM_RX_4 Audio Mixer", "MultiMedia14", "MM_DL14"},

	{"TERT_TDM_RX_4 Audio Mixer", "MultiMedia15", "MM_DL15"},

	{"TERT_TDM_RX_4 Audio Mixer", "MultiMedia16", "MM_DL16"},

	{"TERT_TDM_RX_4", NULL, "TERT_TDM_RX_4 Audio Mixer"},



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

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

	{"QUAT_TDM_RX_0 Audio Mixer", "MultiMedia3", "MM_DL3"},
@@ -11494,6 +11566,7 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"BE_OUT", NULL, "TERT_TDM_RX_1"},

	{"BE_OUT", NULL, "TERT_TDM_RX_2"},

	{"BE_OUT", NULL, "TERT_TDM_RX_3"},

	{"BE_OUT", NULL, "TERT_TDM_RX_4"},

	{"BE_OUT", NULL, "QUAT_TDM_RX_0"},

	{"BE_OUT", NULL, "QUAT_TDM_RX_1"},

	{"BE_OUT", NULL, "QUAT_TDM_RX_2"},