Merge "asoc: Add routing controls for SLIM_1_TX" (3cf9436f) · Commits · e / devices / android_kernel_oneplus_sm8150

asoc/msm-pcm-routing-v2.c

+75 −0

Original line number	Diff line number	Diff line
		@@ -9400,6 +9400,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,
		@@ -9802,6 +9806,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,
		@@ -9993,6 +10001,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,
		@@ -10180,6 +10192,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,
		@@ -10399,6 +10415,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,
		@@ -10586,6 +10606,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,
		@@ -10785,6 +10809,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,
		@@ -10990,6 +11018,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,
		@@ -11125,6 +11157,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,
		@@ -11293,6 +11329,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,
		@@ -11394,6 +11434,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,
		@@ -11499,6 +11543,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,
		@@ -11898,6 +11946,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,
		@@ -11945,6 +11997,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,
		@@ -12046,6 +12102,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,
		@@ -19995,12 +20055,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"},
		@@ -20022,9 +20089,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"},
		@@ -20705,6 +20776,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"},
		@@ -20735,6 +20807,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"},
		@@ -20998,6 +21071,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"},
		@@ -21115,6 +21189,7 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"MultiMedia21 Mixer", "SEC_SPDIF_TX", "SEC_SPDIF_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"},