Merge "asoc: Add routing controls for SLIM_1_TX" (dacd65b4) · Commits · e / devices / android_kernel_fairphone_FP4

asoc/msm-pcm-routing-v2.c

+75 −0

Original line number	Diff line number	Diff line
		@@ -9373,6 +9373,10 @@ static const struct snd_kcontrol_new mmul1_mixer_controls[] = {
		MSM_BACKEND_DAI_SLIMBUS_0_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA1, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("SLIM_1_TX", SND_SOC_NOPM,
		MSM_BACKEND_DAI_SLIMBUS_1_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA1, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("AUX_PCM_UL_TX", SND_SOC_NOPM,
		MSM_BACKEND_DAI_AUXPCM_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA1, 1, 0, msm_routing_get_audio_mixer,
		@@ -9791,6 +9795,10 @@ static const struct snd_kcontrol_new mmul3_mixer_controls[] = {
		MSM_BACKEND_DAI_SLIMBUS_0_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA3, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("SLIM_1_TX", SND_SOC_NOPM,
		MSM_BACKEND_DAI_SLIMBUS_1_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA3, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("INTERNAL_FM_TX", SND_SOC_NOPM,
		MSM_BACKEND_DAI_INT_FM_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA3, 1, 0, msm_routing_get_audio_mixer,
		@@ -9990,6 +9998,10 @@ static const struct snd_kcontrol_new mmul4_mixer_controls[] = {
		MSM_BACKEND_DAI_SLIMBUS_0_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA4, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("SLIM_1_TX", SND_SOC_NOPM,
		MSM_BACKEND_DAI_SLIMBUS_1_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA4, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("PRI_MI2S_TX", SND_SOC_NOPM,
		MSM_BACKEND_DAI_PRI_MI2S_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA4, 1, 0, msm_routing_get_audio_mixer,
		@@ -10185,6 +10197,10 @@ static const struct snd_kcontrol_new mmul5_mixer_controls[] = {
		MSM_BACKEND_DAI_SLIMBUS_0_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA5, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("SLIM_1_TX", SND_SOC_NOPM,
		MSM_BACKEND_DAI_SLIMBUS_1_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA5, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("INTERNAL_FM_TX", SND_SOC_NOPM,
		MSM_BACKEND_DAI_INT_FM_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA5, 1, 0, msm_routing_get_audio_mixer,
		@@ -10412,6 +10428,10 @@ static const struct snd_kcontrol_new mmul6_mixer_controls[] = {
		MSM_BACKEND_DAI_SLIMBUS_0_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA6, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("SLIM_1_TX", SND_SOC_NOPM,
		MSM_BACKEND_DAI_SLIMBUS_1_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA6, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("PRI_MI2S_TX", SND_SOC_NOPM,
		MSM_BACKEND_DAI_PRI_MI2S_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA6, 1, 0, msm_routing_get_audio_mixer,
		@@ -10607,6 +10627,10 @@ static const struct snd_kcontrol_new mmul8_mixer_controls[] = {
		MSM_BACKEND_DAI_SLIMBUS_0_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA8, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("SLIM_1_TX", SND_SOC_NOPM,
		MSM_BACKEND_DAI_SLIMBUS_1_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA8, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("PRI_MI2S_TX", SND_SOC_NOPM,
		MSM_BACKEND_DAI_PRI_MI2S_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA8, 1, 0, msm_routing_get_audio_mixer,
		@@ -10814,6 +10838,10 @@ static const struct snd_kcontrol_new mmul16_mixer_controls[] = {
		MSM_BACKEND_DAI_SLIMBUS_0_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("SLIM_1_TX", SND_SOC_NOPM,
		MSM_BACKEND_DAI_SLIMBUS_1_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("PRI_MI2S_TX", SND_SOC_NOPM,
		MSM_BACKEND_DAI_PRI_MI2S_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,
		@@ -11027,6 +11055,10 @@ static const struct snd_kcontrol_new mmul9_mixer_controls[] = {
		MSM_BACKEND_DAI_SLIMBUS_0_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA9, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("SLIM_1_TX", SND_SOC_NOPM,
		MSM_BACKEND_DAI_SLIMBUS_1_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA9, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("PRI_MI2S_TX", SND_SOC_NOPM,
		MSM_BACKEND_DAI_PRI_MI2S_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA9, 1, 0, msm_routing_get_audio_mixer,
		@@ -11170,6 +11202,10 @@ static const struct snd_kcontrol_new mmul10_mixer_controls[] = {
		MSM_BACKEND_DAI_SLIMBUS_0_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA10, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("SLIM_1_TX", SND_SOC_NOPM,
		MSM_BACKEND_DAI_SLIMBUS_1_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA10, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("PRI_MI2S_TX", SND_SOC_NOPM,
		MSM_BACKEND_DAI_PRI_MI2S_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA10, 1, 0, msm_routing_get_audio_mixer,
		@@ -11346,6 +11382,10 @@ static const struct snd_kcontrol_new mmul17_mixer_controls[] = {
		MSM_BACKEND_DAI_SLIMBUS_0_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA17, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("SLIM_1_TX", SND_SOC_NOPM,
		MSM_BACKEND_DAI_SLIMBUS_1_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA17, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("PRI_MI2S_TX", SND_SOC_NOPM,
		MSM_BACKEND_DAI_PRI_MI2S_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA17, 1, 0, msm_routing_get_audio_mixer,
		@@ -11455,6 +11495,10 @@ static const struct snd_kcontrol_new mmul18_mixer_controls[] = {
		MSM_BACKEND_DAI_SLIMBUS_0_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA18, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("SLIM_1_TX", SND_SOC_NOPM,
		MSM_BACKEND_DAI_SLIMBUS_1_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA18, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("PRI_MI2S_TX", SND_SOC_NOPM,
		MSM_BACKEND_DAI_PRI_MI2S_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA18, 1, 0, msm_routing_get_audio_mixer,
		@@ -11568,6 +11612,10 @@ static const struct snd_kcontrol_new mmul19_mixer_controls[] = {
		MSM_BACKEND_DAI_SLIMBUS_0_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA19, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("SLIM_1_TX", SND_SOC_NOPM,
		MSM_BACKEND_DAI_SLIMBUS_1_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA19, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("PRI_MI2S_TX", SND_SOC_NOPM,
		MSM_BACKEND_DAI_PRI_MI2S_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA19, 1, 0, msm_routing_get_audio_mixer,
		@@ -11991,6 +12039,10 @@ static const struct snd_kcontrol_new mmul27_mixer_controls[] = {
		MSM_BACKEND_DAI_SLIMBUS_0_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA27, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("SLIM_1_TX", SND_SOC_NOPM,
		MSM_BACKEND_DAI_SLIMBUS_1_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA27, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("SLIM_6_TX", SND_SOC_NOPM,
		MSM_BACKEND_DAI_SLIMBUS_6_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA27, 1, 0, msm_routing_get_audio_mixer,
		@@ -12042,6 +12094,10 @@ static const struct snd_kcontrol_new mmul28_mixer_controls[] = {
		MSM_BACKEND_DAI_SLIMBUS_0_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA28, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("SLIM_1_TX", SND_SOC_NOPM,
		MSM_BACKEND_DAI_SLIMBUS_1_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA28, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("PRI_MI2S_TX", SND_SOC_NOPM,
		MSM_BACKEND_DAI_PRI_MI2S_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA28, 1, 0, msm_routing_get_audio_mixer,
		@@ -12151,6 +12207,10 @@ static const struct snd_kcontrol_new mmul29_mixer_controls[] = {
		MSM_BACKEND_DAI_SLIMBUS_0_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA29, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("SLIM_1_TX", SND_SOC_NOPM,
		MSM_BACKEND_DAI_SLIMBUS_1_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA29, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("PRI_MI2S_TX", SND_SOC_NOPM,
		MSM_BACKEND_DAI_PRI_MI2S_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA29, 1, 0, msm_routing_get_audio_mixer,
		@@ -20255,12 +20315,19 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"MultiMedia8 Mixer", "SLIM_7_TX", "SLIMBUS_7_TX"},
		{"MultiMedia8 Mixer", "SLIM_9_TX", "SLIMBUS_9_TX"},
		{"MultiMedia4 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},
		{"MultiMedia4 Mixer", "SLIM_1_TX", "SLIMBUS_1_TX"},
		{"MultiMedia17 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},
		{"MultiMedia17 Mixer", "SLIM_1_TX", "SLIMBUS_1_TX"},
		{"MultiMedia18 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},
		{"MultiMedia18 Mixer", "SLIM_1_TX", "SLIMBUS_1_TX"},
		{"MultiMedia19 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},
		{"MultiMedia19 Mixer", "SLIM_1_TX", "SLIMBUS_1_TX"},
		{"MultiMedia28 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},
		{"MultiMedia28 Mixer", "SLIM_1_TX", "SLIMBUS_1_TX"},
		{"MultiMedia29 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},
		{"MultiMedia29 Mixer", "SLIM_1_TX", "SLIMBUS_1_TX"},
		{"MultiMedia8 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},
		{"MultiMedia8 Mixer", "SLIM_1_TX", "SLIMBUS_1_TX"},
		{"MultiMedia2 Mixer", "PRI_MI2S_TX", "PRI_MI2S_TX"},
		{"MultiMedia4 Mixer", "PRI_MI2S_TX", "PRI_MI2S_TX"},
		{"MultiMedia17 Mixer", "PRI_MI2S_TX", "PRI_MI2S_TX"},
		@@ -20282,9 +20349,13 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"MultiMedia29 Mixer", "QUAT_MI2S_TX", "QUAT_MI2S_TX"},
		{"MultiMedia8 Mixer", "INT3_MI2S_TX", "INT3_MI2S_TX"},
		{"MultiMedia3 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},
		{"MultiMedia3 Mixer", "SLIM_1_TX", "SLIMBUS_1_TX"},
		{"MultiMedia5 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},
		{"MultiMedia5 Mixer", "SLIM_1_TX", "SLIMBUS_1_TX"},
		{"MultiMedia10 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},
		{"MultiMedia10 Mixer", "SLIM_1_TX", "SLIMBUS_1_TX"},
		{"MultiMedia16 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},
		{"MultiMedia16 Mixer", "SLIM_1_TX", "SLIMBUS_1_TX"},
		{"MultiMedia5 Mixer", "SLIM_7_TX", "SLIMBUS_7_TX"},
		{"MultiMedia5 Mixer", "SLIM_8_TX", "SLIMBUS_8_TX"},
		{"MultiMedia5 Mixer", "SLIM_9_TX", "SLIMBUS_9_TX"},
		@@ -20957,6 +21028,7 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"MultiMedia1 Mixer", "INT3_MI2S_TX", "INT3_MI2S_TX"},
		{"MultiMedia2 Mixer", "INT3_MI2S_TX", "INT3_MI2S_TX"},
		{"MultiMedia1 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},
		{"MultiMedia1 Mixer", "SLIM_1_TX", "SLIMBUS_1_TX"},
		{"MultiMedia1 Mixer", "AUX_PCM_UL_TX", "AUX_PCM_TX"},
		{"MultiMedia3 Mixer", "AUX_PCM_TX", "AUX_PCM_TX"},
		{"MultiMedia5 Mixer", "AUX_PCM_UL_TX", "AUX_PCM_TX"},
		@@ -20987,6 +21059,7 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"MultiMedia1 Mixer", "PRI_MI2S_TX", "PRI_MI2S_TX"},
		{"MultiMedia2 Mixer", "SEC_MI2S_TX", "SEC_MI2S_TX"},
		{"MultiMedia6 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},
		{"MultiMedia6 Mixer", "SLIM_1_TX", "SLIMBUS_1_TX"},
		{"MultiMedia6 Mixer", "TERT_MI2S_TX", "TERT_MI2S_TX"},
		{"MultiMedia3 Mixer", "TERT_MI2S_TX", "TERT_MI2S_TX"},
		{"MultiMedia5 Mixer", "TERT_MI2S_TX", "TERT_MI2S_TX"},
		@@ -21264,6 +21337,7 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"MultiMedia8 Mixer", "PRI_SPDIF_TX", "PRI_SPDIF_TX"},
		{"MultiMedia8 Mixer", "SEC_SPDIF_TX", "SEC_SPDIF_TX"},

		{"MultiMedia9 Mixer", "SLIM_1_TX", "SLIMBUS_1_TX"},
		{"MultiMedia9 Mixer", "TERT_TDM_TX_0", "TERT_TDM_TX_0"},
		{"MultiMedia9 Mixer", "TERT_TDM_TX_1", "TERT_TDM_TX_1"},
		{"MultiMedia9 Mixer", "TERT_TDM_TX_2", "TERT_TDM_TX_2"},
		@@ -21388,6 +21462,7 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"MultiMedia21 Mixer", "AFE_LOOPBACK_TX", "AFE_LOOPBACK_TX"},

		{"MultiMedia27 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},
		{"MultiMedia27 Mixer", "SLIM_1_TX", "SLIMBUS_1_TX"},
		{"MultiMedia27 Mixer", "SLIM_6_TX", "SLIMBUS_6_TX"},
		{"MultiMedia27 Mixer", "SLIM_7_TX", "SLIMBUS_7_TX"},
		{"MultiMedia27 Mixer", "SLIM_9_TX", "SLIMBUS_9_TX"},