Merge "ASoC: QCS405: Additional TDM samplerates and channels" (deceaf9e) · Commits · e / devices / android_kernel_fairphone_FP5

asoc/msm-dai-q6-v2.c

+17 −17

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-only
		/* Copyright (c) 2012-2020, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2012-2021, The Linux Foundation. All rights reserved.
		*/

		#include <linux/init.h>
		@@ -12034,7 +12034,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = {
		SNDRV_PCM_FMTBIT_S24_LE \|
		SNDRV_PCM_FMTBIT_S32_LE,
		.channels_min = 1,
		.channels_max = 8,
		.channels_max = 16,
		.rate_min = 8000,
		.rate_max = 352800,
		},
		@@ -12055,7 +12055,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = {
		SNDRV_PCM_FMTBIT_S24_LE \|
		SNDRV_PCM_FMTBIT_S32_LE,
		.channels_min = 1,
		.channels_max = 8,
		.channels_max = 16,
		.rate_min = 8000,
		.rate_max = 352800,
		},
		@@ -12076,7 +12076,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = {
		SNDRV_PCM_FMTBIT_S24_LE \|
		SNDRV_PCM_FMTBIT_S32_LE,
		.channels_min = 1,
		.channels_max = 8,
		.channels_max = 16,
		.rate_min = 8000,
		.rate_max = 352800,
		},
		@@ -12097,7 +12097,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = {
		SNDRV_PCM_FMTBIT_S24_LE \|
		SNDRV_PCM_FMTBIT_S32_LE,
		.channels_min = 1,
		.channels_max = 8,
		.channels_max = 16,
		.rate_min = 8000,
		.rate_max = 352800,
		},
		@@ -12118,7 +12118,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = {
		SNDRV_PCM_FMTBIT_S24_LE \|
		SNDRV_PCM_FMTBIT_S32_LE,
		.channels_min = 1,
		.channels_max = 8,
		.channels_max = 16,
		.rate_min = 8000,
		.rate_max = 352800,
		},
		@@ -12139,7 +12139,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = {
		SNDRV_PCM_FMTBIT_S24_LE \|
		SNDRV_PCM_FMTBIT_S32_LE,
		.channels_min = 1,
		.channels_max = 8,
		.channels_max = 16,
		.rate_min = 8000,
		.rate_max = 352800,
		},
		@@ -12160,7 +12160,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = {
		SNDRV_PCM_FMTBIT_S24_LE \|
		SNDRV_PCM_FMTBIT_S32_LE,
		.channels_min = 1,
		.channels_max = 8,
		.channels_max = 16,
		.rate_min = 8000,
		.rate_max = 352800,
		},
		@@ -12181,7 +12181,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = {
		SNDRV_PCM_FMTBIT_S24_LE \|
		SNDRV_PCM_FMTBIT_S32_LE,
		.channels_min = 1,
		.channels_max = 8,
		.channels_max = 16,
		.rate_min = 8000,
		.rate_max = 352800,
		},
		@@ -12202,7 +12202,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = {
		SNDRV_PCM_FMTBIT_S24_LE \|
		SNDRV_PCM_FMTBIT_S32_LE,
		.channels_min = 1,
		.channels_max = 8,
		.channels_max = 16,
		.rate_min = 8000,
		.rate_max = 352800,
		},
		@@ -12223,7 +12223,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = {
		SNDRV_PCM_FMTBIT_S24_LE \|
		SNDRV_PCM_FMTBIT_S32_LE,
		.channels_min = 1,
		.channels_max = 8,
		.channels_max = 16,
		.rate_min = 8000,
		.rate_max = 352800,
		},
		@@ -12244,7 +12244,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = {
		SNDRV_PCM_FMTBIT_S24_LE \|
		SNDRV_PCM_FMTBIT_S32_LE,
		.channels_min = 1,
		.channels_max = 8,
		.channels_max = 16,
		.rate_min = 8000,
		.rate_max = 352800,
		},
		@@ -12265,7 +12265,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = {
		SNDRV_PCM_FMTBIT_S24_LE \|
		SNDRV_PCM_FMTBIT_S32_LE,
		.channels_min = 1,
		.channels_max = 8,
		.channels_max = 16,
		.rate_min = 8000,
		.rate_max = 352800,
		},
		@@ -12286,7 +12286,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = {
		SNDRV_PCM_FMTBIT_S24_LE \|
		SNDRV_PCM_FMTBIT_S32_LE,
		.channels_min = 1,
		.channels_max = 8,
		.channels_max = 16,
		.rate_min = 8000,
		.rate_max = 352800,
		},
		@@ -12307,7 +12307,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = {
		SNDRV_PCM_FMTBIT_S24_LE \|
		SNDRV_PCM_FMTBIT_S32_LE,
		.channels_min = 1,
		.channels_max = 8,
		.channels_max = 16,
		.rate_min = 8000,
		.rate_max = 352800,
		},
		@@ -12328,7 +12328,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = {
		SNDRV_PCM_FMTBIT_S24_LE \|
		SNDRV_PCM_FMTBIT_S32_LE,
		.channels_min = 1,
		.channels_max = 8,
		.channels_max = 16,
		.rate_min = 8000,
		.rate_max = 352800,
		},
		@@ -12349,7 +12349,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = {
		SNDRV_PCM_FMTBIT_S24_LE \|
		SNDRV_PCM_FMTBIT_S32_LE,
		.channels_min = 1,
		.channels_max = 8,
		.channels_max = 16,
		.rate_min = 8000,
		.rate_max = 352800,
		},

asoc/msm-pcm-routing-v2.c

+290 −0

Original line number	Diff line number	Diff line
		@@ -12064,6 +12064,14 @@ static const struct snd_kcontrol_new quat_tdm_rx_0_mixer_controls[] = {
		MSM_BACKEND_DAI_QUAT_TDM_RX_0,
		MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("MultiMedia18", SND_SOC_NOPM,
		MSM_BACKEND_DAI_QUAT_TDM_RX_0,
		MSM_FRONTEND_DAI_MULTIMEDIA18, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("MultiMedia19", SND_SOC_NOPM,
		MSM_BACKEND_DAI_QUAT_TDM_RX_0,
		MSM_FRONTEND_DAI_MULTIMEDIA19, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("MultiMedia20", SND_SOC_NOPM,
		MSM_BACKEND_DAI_QUAT_TDM_RX_0,
		MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
		@@ -12088,6 +12096,14 @@ static const struct snd_kcontrol_new quat_tdm_rx_0_mixer_controls[] = {
		MSM_BACKEND_DAI_QUAT_TDM_RX_0,
		MSM_FRONTEND_DAI_MULTIMEDIA25, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("MultiMedia28", SND_SOC_NOPM,
		MSM_BACKEND_DAI_QUAT_TDM_RX_0,
		MSM_FRONTEND_DAI_MULTIMEDIA28, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("MultiMedia29", SND_SOC_NOPM,
		MSM_BACKEND_DAI_QUAT_TDM_RX_0,
		MSM_FRONTEND_DAI_MULTIMEDIA29, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("MultiMedia31", SND_SOC_NOPM,
		MSM_BACKEND_DAI_QUAT_TDM_RX_0,
		MSM_FRONTEND_DAI_MULTIMEDIA31, 1, 0, msm_routing_get_audio_mixer,
		@@ -12171,6 +12187,14 @@ static const struct snd_kcontrol_new quat_tdm_rx_1_mixer_controls[] = {
		MSM_BACKEND_DAI_QUAT_TDM_RX_1,
		MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("MultiMedia18", SND_SOC_NOPM,
		MSM_BACKEND_DAI_QUAT_TDM_RX_1,
		MSM_FRONTEND_DAI_MULTIMEDIA18, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("MultiMedia19", SND_SOC_NOPM,
		MSM_BACKEND_DAI_QUAT_TDM_RX_1,
		MSM_FRONTEND_DAI_MULTIMEDIA19, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("MultiMedia20", SND_SOC_NOPM,
		MSM_BACKEND_DAI_QUAT_TDM_RX_1,
		MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
		@@ -12195,6 +12219,14 @@ static const struct snd_kcontrol_new quat_tdm_rx_1_mixer_controls[] = {
		MSM_BACKEND_DAI_QUAT_TDM_RX_1,
		MSM_FRONTEND_DAI_MULTIMEDIA25, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("MultiMedia28", SND_SOC_NOPM,
		MSM_BACKEND_DAI_QUAT_TDM_RX_1,
		MSM_FRONTEND_DAI_MULTIMEDIA28, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("MultiMedia29", SND_SOC_NOPM,
		MSM_BACKEND_DAI_QUAT_TDM_RX_1,
		MSM_FRONTEND_DAI_MULTIMEDIA29, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("MultiMedia31", SND_SOC_NOPM,
		MSM_BACKEND_DAI_QUAT_TDM_RX_1,
		MSM_FRONTEND_DAI_MULTIMEDIA31, 1, 0, msm_routing_get_audio_mixer,
		@@ -12278,6 +12310,14 @@ static const struct snd_kcontrol_new quat_tdm_rx_2_mixer_controls[] = {
		MSM_BACKEND_DAI_QUAT_TDM_RX_2,
		MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("MultiMedia18", SND_SOC_NOPM,
		MSM_BACKEND_DAI_QUAT_TDM_RX_2,
		MSM_FRONTEND_DAI_MULTIMEDIA18, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("MultiMedia19", SND_SOC_NOPM,
		MSM_BACKEND_DAI_QUAT_TDM_RX_2,
		MSM_FRONTEND_DAI_MULTIMEDIA19, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("MultiMedia20", SND_SOC_NOPM,
		MSM_BACKEND_DAI_QUAT_TDM_RX_2,
		MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
		@@ -12302,6 +12342,14 @@ static const struct snd_kcontrol_new quat_tdm_rx_2_mixer_controls[] = {
		MSM_BACKEND_DAI_QUAT_TDM_RX_2,
		MSM_FRONTEND_DAI_MULTIMEDIA25, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("MultiMedia28", SND_SOC_NOPM,
		MSM_BACKEND_DAI_QUAT_TDM_RX_2,
		MSM_FRONTEND_DAI_MULTIMEDIA28, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("MultiMedia29", SND_SOC_NOPM,
		MSM_BACKEND_DAI_QUAT_TDM_RX_2,
		MSM_FRONTEND_DAI_MULTIMEDIA29, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("MultiMedia31", SND_SOC_NOPM,
		MSM_BACKEND_DAI_QUAT_TDM_RX_2,
		MSM_FRONTEND_DAI_MULTIMEDIA31, 1, 0, msm_routing_get_audio_mixer,
		@@ -12385,6 +12433,14 @@ static const struct snd_kcontrol_new quat_tdm_rx_3_mixer_controls[] = {
		MSM_BACKEND_DAI_QUAT_TDM_RX_3,
		MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("MultiMedia18", SND_SOC_NOPM,
		MSM_BACKEND_DAI_QUAT_TDM_RX_3,
		MSM_FRONTEND_DAI_MULTIMEDIA18, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("MultiMedia19", SND_SOC_NOPM,
		MSM_BACKEND_DAI_QUAT_TDM_RX_3,
		MSM_FRONTEND_DAI_MULTIMEDIA19, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("MultiMedia20", SND_SOC_NOPM,
		MSM_BACKEND_DAI_QUAT_TDM_RX_3,
		MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
		@@ -12409,6 +12465,14 @@ static const struct snd_kcontrol_new quat_tdm_rx_3_mixer_controls[] = {
		MSM_BACKEND_DAI_QUAT_TDM_RX_3,
		MSM_FRONTEND_DAI_MULTIMEDIA25, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("MultiMedia28", SND_SOC_NOPM,
		MSM_BACKEND_DAI_QUAT_TDM_RX_3,
		MSM_FRONTEND_DAI_MULTIMEDIA28, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("MultiMedia29", SND_SOC_NOPM,
		MSM_BACKEND_DAI_QUAT_TDM_RX_3,
		MSM_FRONTEND_DAI_MULTIMEDIA29, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("MultiMedia31", SND_SOC_NOPM,
		MSM_BACKEND_DAI_QUAT_TDM_RX_3,
		MSM_FRONTEND_DAI_MULTIMEDIA31, 1, 0, msm_routing_get_audio_mixer,
		@@ -12921,6 +12985,14 @@ static const struct snd_kcontrol_new sen_tdm_rx_0_mixer_controls[] = {
		MSM_BACKEND_DAI_SEN_TDM_RX_0,
		MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("MultiMedia18", SND_SOC_NOPM,
		MSM_BACKEND_DAI_SEN_TDM_RX_0,
		MSM_FRONTEND_DAI_MULTIMEDIA18, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("MultiMedia19", SND_SOC_NOPM,
		MSM_BACKEND_DAI_SEN_TDM_RX_0,
		MSM_FRONTEND_DAI_MULTIMEDIA19, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("MultiMedia20", SND_SOC_NOPM,
		MSM_BACKEND_DAI_SEN_TDM_RX_0,
		MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
		@@ -12929,6 +13001,14 @@ static const struct snd_kcontrol_new sen_tdm_rx_0_mixer_controls[] = {
		MSM_BACKEND_DAI_SEN_TDM_RX_0,
		MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("MultiMedia28", SND_SOC_NOPM,
		MSM_BACKEND_DAI_SEN_TDM_RX_0,
		MSM_FRONTEND_DAI_MULTIMEDIA28, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("MultiMedia29", SND_SOC_NOPM,
		MSM_BACKEND_DAI_SEN_TDM_RX_0,
		MSM_FRONTEND_DAI_MULTIMEDIA29, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		};

		static const struct snd_kcontrol_new sen_tdm_rx_1_mixer_controls[] = {
		@@ -12996,6 +13076,14 @@ static const struct snd_kcontrol_new sen_tdm_rx_1_mixer_controls[] = {
		MSM_BACKEND_DAI_SEN_TDM_RX_1,
		MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("MultiMedia18", SND_SOC_NOPM,
		MSM_BACKEND_DAI_SEN_TDM_RX_1,
		MSM_FRONTEND_DAI_MULTIMEDIA18, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("MultiMedia19", SND_SOC_NOPM,
		MSM_BACKEND_DAI_SEN_TDM_RX_1,
		MSM_FRONTEND_DAI_MULTIMEDIA19, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("MultiMedia20", SND_SOC_NOPM,
		MSM_BACKEND_DAI_SEN_TDM_RX_1,
		MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
		@@ -13004,6 +13092,14 @@ static const struct snd_kcontrol_new sen_tdm_rx_1_mixer_controls[] = {
		MSM_BACKEND_DAI_SEN_TDM_RX_1,
		MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("MultiMedia28", SND_SOC_NOPM,
		MSM_BACKEND_DAI_SEN_TDM_RX_1,
		MSM_FRONTEND_DAI_MULTIMEDIA28, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("MultiMedia29", SND_SOC_NOPM,
		MSM_BACKEND_DAI_SEN_TDM_RX_1,
		MSM_FRONTEND_DAI_MULTIMEDIA29, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		};

		static const struct snd_kcontrol_new sen_tdm_rx_2_mixer_controls[] = {
		@@ -13071,6 +13167,14 @@ static const struct snd_kcontrol_new sen_tdm_rx_2_mixer_controls[] = {
		MSM_BACKEND_DAI_SEN_TDM_RX_2,
		MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("MultiMedia18", SND_SOC_NOPM,
		MSM_BACKEND_DAI_SEN_TDM_RX_2,
		MSM_FRONTEND_DAI_MULTIMEDIA18, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("MultiMedia19", SND_SOC_NOPM,
		MSM_BACKEND_DAI_SEN_TDM_RX_2,
		MSM_FRONTEND_DAI_MULTIMEDIA19, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("MultiMedia20", SND_SOC_NOPM,
		MSM_BACKEND_DAI_SEN_TDM_RX_2,
		MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
		@@ -13079,6 +13183,14 @@ static const struct snd_kcontrol_new sen_tdm_rx_2_mixer_controls[] = {
		MSM_BACKEND_DAI_SEN_TDM_RX_2,
		MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("MultiMedia28", SND_SOC_NOPM,
		MSM_BACKEND_DAI_SEN_TDM_RX_2,
		MSM_FRONTEND_DAI_MULTIMEDIA28, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("MultiMedia29", SND_SOC_NOPM,
		MSM_BACKEND_DAI_SEN_TDM_RX_2,
		MSM_FRONTEND_DAI_MULTIMEDIA29, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		};

		static const struct snd_kcontrol_new sen_tdm_rx_3_mixer_controls[] = {
		@@ -13146,6 +13258,14 @@ static const struct snd_kcontrol_new sen_tdm_rx_3_mixer_controls[] = {
		MSM_BACKEND_DAI_SEN_TDM_RX_3,
		MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("MultiMedia18", SND_SOC_NOPM,
		MSM_BACKEND_DAI_SEN_TDM_RX_3,
		MSM_FRONTEND_DAI_MULTIMEDIA18, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("MultiMedia19", SND_SOC_NOPM,
		MSM_BACKEND_DAI_SEN_TDM_RX_3,
		MSM_FRONTEND_DAI_MULTIMEDIA19, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("MultiMedia20", SND_SOC_NOPM,
		MSM_BACKEND_DAI_SEN_TDM_RX_3,
		MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
		@@ -13154,6 +13274,14 @@ static const struct snd_kcontrol_new sen_tdm_rx_3_mixer_controls[] = {
		MSM_BACKEND_DAI_SEN_TDM_RX_3,
		MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("MultiMedia28", SND_SOC_NOPM,
		MSM_BACKEND_DAI_SEN_TDM_RX_3,
		MSM_FRONTEND_DAI_MULTIMEDIA28, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("MultiMedia29", SND_SOC_NOPM,
		MSM_BACKEND_DAI_SEN_TDM_RX_3,
		MSM_FRONTEND_DAI_MULTIMEDIA29, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		};

		static const struct snd_kcontrol_new quat_tdm_rx_2_voice_mixer_controls[] = {
		@@ -18885,6 +19013,38 @@ static const struct snd_kcontrol_new mmul18_mixer_controls[] = {
		MSM_BACKEND_DAI_AFE_LOOPBACK_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA18, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("QUAT_TDM_TX_0", SND_SOC_NOPM,
		MSM_BACKEND_DAI_QUAT_TDM_TX_0,
		MSM_FRONTEND_DAI_MULTIMEDIA18, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("QUAT_TDM_TX_1", SND_SOC_NOPM,
		MSM_BACKEND_DAI_QUAT_TDM_TX_1,
		MSM_FRONTEND_DAI_MULTIMEDIA18, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("QUAT_TDM_TX_2", SND_SOC_NOPM,
		MSM_BACKEND_DAI_QUAT_TDM_TX_2,
		MSM_FRONTEND_DAI_MULTIMEDIA18, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("QUAT_TDM_TX_3", SND_SOC_NOPM,
		MSM_BACKEND_DAI_QUAT_TDM_TX_3,
		MSM_FRONTEND_DAI_MULTIMEDIA18, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("SEN_TDM_TX_0", SND_SOC_NOPM,
		MSM_BACKEND_DAI_SEN_TDM_TX_0,
		MSM_FRONTEND_DAI_MULTIMEDIA18, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("SEN_TDM_TX_1", SND_SOC_NOPM,
		MSM_BACKEND_DAI_SEN_TDM_TX_1,
		MSM_FRONTEND_DAI_MULTIMEDIA18, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("SEN_TDM_TX_2", SND_SOC_NOPM,
		MSM_BACKEND_DAI_SEN_TDM_TX_2,
		MSM_FRONTEND_DAI_MULTIMEDIA18, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("SEN_TDM_TX_3", SND_SOC_NOPM,
		MSM_BACKEND_DAI_SEN_TDM_TX_3,
		MSM_FRONTEND_DAI_MULTIMEDIA18, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		};

		static const struct snd_kcontrol_new mmul19_mixer_controls[] = {
		@@ -19008,6 +19168,38 @@ static const struct snd_kcontrol_new mmul19_mixer_controls[] = {
		MSM_BACKEND_DAI_SLIMBUS_9_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA19, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("QUAT_TDM_TX_0", SND_SOC_NOPM,
		MSM_BACKEND_DAI_QUAT_TDM_TX_0,
		MSM_FRONTEND_DAI_MULTIMEDIA19, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("QUAT_TDM_TX_1", SND_SOC_NOPM,
		MSM_BACKEND_DAI_QUAT_TDM_TX_1,
		MSM_FRONTEND_DAI_MULTIMEDIA19, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("QUAT_TDM_TX_2", SND_SOC_NOPM,
		MSM_BACKEND_DAI_QUAT_TDM_TX_2,
		MSM_FRONTEND_DAI_MULTIMEDIA19, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("QUAT_TDM_TX_3", SND_SOC_NOPM,
		MSM_BACKEND_DAI_QUAT_TDM_TX_3,
		MSM_FRONTEND_DAI_MULTIMEDIA19, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("SEN_TDM_TX_0", SND_SOC_NOPM,
		MSM_BACKEND_DAI_SEN_TDM_TX_0,
		MSM_FRONTEND_DAI_MULTIMEDIA19, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("SEN_TDM_TX_1", SND_SOC_NOPM,
		MSM_BACKEND_DAI_SEN_TDM_TX_1,
		MSM_FRONTEND_DAI_MULTIMEDIA19, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("SEN_TDM_TX_2", SND_SOC_NOPM,
		MSM_BACKEND_DAI_SEN_TDM_TX_2,
		MSM_FRONTEND_DAI_MULTIMEDIA19, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("SEN_TDM_TX_3", SND_SOC_NOPM,
		MSM_BACKEND_DAI_SEN_TDM_TX_3,
		MSM_FRONTEND_DAI_MULTIMEDIA19, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		};

		static const struct snd_kcontrol_new mmul20_mixer_controls[] = {
		@@ -19894,6 +20086,38 @@ static const struct snd_kcontrol_new mmul28_mixer_controls[] = {
		MSM_BACKEND_DAI_SLIMBUS_9_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA28, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("QUAT_TDM_TX_0", SND_SOC_NOPM,
		MSM_BACKEND_DAI_QUAT_TDM_TX_0,
		MSM_FRONTEND_DAI_MULTIMEDIA28, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("QUAT_TDM_TX_1", SND_SOC_NOPM,
		MSM_BACKEND_DAI_QUAT_TDM_TX_1,
		MSM_FRONTEND_DAI_MULTIMEDIA28, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("QUAT_TDM_TX_2", SND_SOC_NOPM,
		MSM_BACKEND_DAI_QUAT_TDM_TX_2,
		MSM_FRONTEND_DAI_MULTIMEDIA28, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("QUAT_TDM_TX_3", SND_SOC_NOPM,
		MSM_BACKEND_DAI_QUAT_TDM_TX_3,
		MSM_FRONTEND_DAI_MULTIMEDIA28, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("SEN_TDM_TX_0", SND_SOC_NOPM,
		MSM_BACKEND_DAI_SEN_TDM_TX_0,
		MSM_FRONTEND_DAI_MULTIMEDIA28, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("SEN_TDM_TX_1", SND_SOC_NOPM,
		MSM_BACKEND_DAI_SEN_TDM_TX_1,
		MSM_FRONTEND_DAI_MULTIMEDIA28, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("SEN_TDM_TX_2", SND_SOC_NOPM,
		MSM_BACKEND_DAI_SEN_TDM_TX_2,
		MSM_FRONTEND_DAI_MULTIMEDIA28, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("SEN_TDM_TX_3", SND_SOC_NOPM,
		MSM_BACKEND_DAI_SEN_TDM_TX_3,
		MSM_FRONTEND_DAI_MULTIMEDIA28, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		};

		static const struct snd_kcontrol_new mmul29_mixer_controls[] = {
		@@ -20017,6 +20241,38 @@ static const struct snd_kcontrol_new mmul29_mixer_controls[] = {
		MSM_BACKEND_DAI_SLIMBUS_9_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA29, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("QUAT_TDM_TX_0", SND_SOC_NOPM,
		MSM_BACKEND_DAI_QUAT_TDM_TX_0,
		MSM_FRONTEND_DAI_MULTIMEDIA29, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("QUAT_TDM_TX_1", SND_SOC_NOPM,
		MSM_BACKEND_DAI_QUAT_TDM_TX_1,
		MSM_FRONTEND_DAI_MULTIMEDIA29, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("QUAT_TDM_TX_2", SND_SOC_NOPM,
		MSM_BACKEND_DAI_QUAT_TDM_TX_2,
		MSM_FRONTEND_DAI_MULTIMEDIA29, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("QUAT_TDM_TX_3", SND_SOC_NOPM,
		MSM_BACKEND_DAI_QUAT_TDM_TX_3,
		MSM_FRONTEND_DAI_MULTIMEDIA29, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("SEN_TDM_TX_0", SND_SOC_NOPM,
		MSM_BACKEND_DAI_SEN_TDM_TX_0,
		MSM_FRONTEND_DAI_MULTIMEDIA29, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("SEN_TDM_TX_1", SND_SOC_NOPM,
		MSM_BACKEND_DAI_SEN_TDM_TX_1,
		MSM_FRONTEND_DAI_MULTIMEDIA29, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("SEN_TDM_TX_2", SND_SOC_NOPM,
		MSM_BACKEND_DAI_SEN_TDM_TX_2,
		MSM_FRONTEND_DAI_MULTIMEDIA29, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_DOUBLE_EXT("SEN_TDM_TX_3", SND_SOC_NOPM,
		MSM_BACKEND_DAI_SEN_TDM_TX_3,
		MSM_FRONTEND_DAI_MULTIMEDIA29, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		};

		static const struct snd_kcontrol_new mmul30_mixer_controls[] = {
		@@ -27014,6 +27270,15 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"MultiMedia18 Mixer", "AFE_LOOPBACK_TX", "AFE_LOOPBACK_TX"},
		{"MultiMedia18 Mixer", "VA_CDC_DMA_TX_0", "VA_CDC_DMA_TX_0"},
		{"MultiMedia18 Mixer", "VA_CDC_DMA_TX_1", "VA_CDC_DMA_TX_1"},
		{"MultiMedia18 Mixer", "QUAT_TDM_TX_0", "QUAT_TDM_TX_0"},
		{"MultiMedia18 Mixer", "QUAT_TDM_TX_1", "QUAT_TDM_TX_1"},
		{"MultiMedia18 Mixer", "QUAT_TDM_TX_2", "QUAT_TDM_TX_2"},
		{"MultiMedia18 Mixer", "QUAT_TDM_TX_3", "QUAT_TDM_TX_3"},
		{"MultiMedia18 Mixer", "SEN_TDM_TX_0", "SEN_TDM_TX_0"},
		{"MultiMedia18 Mixer", "SEN_TDM_TX_1", "SEN_TDM_TX_1"},
		{"MultiMedia18 Mixer", "SEN_TDM_TX_2", "SEN_TDM_TX_2"},
		{"MultiMedia18 Mixer", "SEN_TDM_TX_3", "SEN_TDM_TX_3"},


		{"MultiMedia19 Mixer", "TX_CDC_DMA_TX_0", "TX_CDC_DMA_TX_0"},
		{"MultiMedia19 Mixer", "TX_CDC_DMA_TX_1", "TX_CDC_DMA_TX_1"},
		@@ -27024,6 +27289,14 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"MultiMedia19 Mixer", "AFE_LOOPBACK_TX", "AFE_LOOPBACK_TX"},
		{"MultiMedia19 Mixer", "VA_CDC_DMA_TX_0", "VA_CDC_DMA_TX_0"},
		{"MultiMedia19 Mixer", "VA_CDC_DMA_TX_1", "VA_CDC_DMA_TX_1"},
		{"MultiMedia19 Mixer", "QUAT_TDM_TX_0", "QUAT_TDM_TX_0"},
		{"MultiMedia19 Mixer", "QUAT_TDM_TX_1", "QUAT_TDM_TX_1"},
		{"MultiMedia19 Mixer", "QUAT_TDM_TX_2", "QUAT_TDM_TX_2"},
		{"MultiMedia19 Mixer", "QUAT_TDM_TX_3", "QUAT_TDM_TX_3"},
		{"MultiMedia19 Mixer", "SEN_TDM_TX_0", "SEN_TDM_TX_0"},
		{"MultiMedia19 Mixer", "SEN_TDM_TX_1", "SEN_TDM_TX_1"},
		{"MultiMedia19 Mixer", "SEN_TDM_TX_2", "SEN_TDM_TX_2"},
		{"MultiMedia19 Mixer", "SEN_TDM_TX_3", "SEN_TDM_TX_3"},

		{"MultiMedia28 Mixer", "TX_CDC_DMA_TX_0", "TX_CDC_DMA_TX_0"},
		{"MultiMedia28 Mixer", "TX_CDC_DMA_TX_1", "TX_CDC_DMA_TX_1"},
		@@ -27034,6 +27307,14 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"MultiMedia28 Mixer", "AFE_LOOPBACK_TX", "AFE_LOOPBACK_TX"},
		{"MultiMedia28 Mixer", "VA_CDC_DMA_TX_0", "VA_CDC_DMA_TX_0"},
		{"MultiMedia28 Mixer", "VA_CDC_DMA_TX_1", "VA_CDC_DMA_TX_1"},
		{"MultiMedia28 Mixer", "QUAT_TDM_TX_0", "QUAT_TDM_TX_0"},
		{"MultiMedia28 Mixer", "QUAT_TDM_TX_1", "QUAT_TDM_TX_1"},
		{"MultiMedia28 Mixer", "QUAT_TDM_TX_2", "QUAT_TDM_TX_2"},
		{"MultiMedia28 Mixer", "QUAT_TDM_TX_3", "QUAT_TDM_TX_3"},
		{"MultiMedia28 Mixer", "SEN_TDM_TX_0", "SEN_TDM_TX_0"},
		{"MultiMedia28 Mixer", "SEN_TDM_TX_1", "SEN_TDM_TX_1"},
		{"MultiMedia28 Mixer", "SEN_TDM_TX_2", "SEN_TDM_TX_2"},
		{"MultiMedia28 Mixer", "SEN_TDM_TX_3", "SEN_TDM_TX_3"},

		{"MultiMedia29 Mixer", "TX_CDC_DMA_TX_0", "TX_CDC_DMA_TX_0"},
		{"MultiMedia29 Mixer", "TX_CDC_DMA_TX_1", "TX_CDC_DMA_TX_1"},
		@@ -27044,6 +27325,15 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"MultiMedia29 Mixer", "AFE_LOOPBACK_TX", "AFE_LOOPBACK_TX"},
		{"MultiMedia29 Mixer", "VA_CDC_DMA_TX_0", "VA_CDC_DMA_TX_0"},
		{"MultiMedia29 Mixer", "VA_CDC_DMA_TX_1", "VA_CDC_DMA_TX_1"},
		{"MultiMedia29 Mixer", "QUAT_TDM_TX_0", "QUAT_TDM_TX_0"},
		{"MultiMedia29 Mixer", "QUAT_TDM_TX_1", "QUAT_TDM_TX_1"},
		{"MultiMedia29 Mixer", "QUAT_TDM_TX_2", "QUAT_TDM_TX_2"},
		{"MultiMedia29 Mixer", "QUAT_TDM_TX_3", "QUAT_TDM_TX_3"},
		{"MultiMedia29 Mixer", "SEN_TDM_TX_0", "SEN_TDM_TX_0"},
		{"MultiMedia29 Mixer", "SEN_TDM_TX_1", "SEN_TDM_TX_1"},
		{"MultiMedia29 Mixer", "SEN_TDM_TX_2", "SEN_TDM_TX_2"},
		{"MultiMedia29 Mixer", "SEN_TDM_TX_3", "SEN_TDM_TX_3"},


		{"MultiMedia30 Mixer", "TX_CDC_DMA_TX_0", "TX_CDC_DMA_TX_0"},
		{"MultiMedia30 Mixer", "TX_CDC_DMA_TX_1", "TX_CDC_DMA_TX_1"},