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

Commit 7357058c authored by Haynes Mathew George's avatar Haynes Mathew George
Browse files

ASoC: msm: qdsp6v2: Reserve MultiMedia16 for NOIRQ 



Reserve MultiMedia16 for second instance of NOIRQ

CRs-Fixed: 2071838
Change-Id: I6a75d9a5e85585f65262ce486c992402ac58bf5f
Signed-off-by: default avatarHaynes Mathew George <hgeorge@codeaurora.org>
parent e868dcc8

sound/soc/msm/apq8096-auto.c

+4 −3
Original line number Diff line number Diff line
@@ -3480,12 +3480,13 @@ static struct snd_soc_dai_link apq8096_common_dai_links[] = { 
		.be_id = MSM_FRONTEND_DAI_MULTIMEDIA15,

	},

	{

		.name = "MSM8996 Compress9",

		.stream_name = "Compress9",

		.name = "MSM8996 ULL NOIRQ 2",

		.stream_name = "MM_NOIRQ_2",

		.cpu_dai_name = "MultiMedia16",

		.platform_name = "msm-compress-dsp",

		.platform_name = "msm-pcm-dsp-noirq",

		.dynamic = 1,

		.dpcm_playback = 1,

		.dpcm_capture = 1,

		.trigger = {SND_SOC_DPCM_TRIGGER_POST,

			 SND_SOC_DPCM_TRIGGER_POST},

		.codec_dai_name = "snd-soc-dummy-dai",

sound/soc/msm/msm-dai-fe.c

+14 −1
Original line number Diff line number Diff line
@@ -2496,8 +2496,21 @@ static struct snd_soc_dai_driver msm_fe_dais[] = { 
			.rate_min =	8000,

			.rate_max = 384000,

		},

		.capture = {

			.stream_name = "MultiMedia16 Capture",

			.aif_name = "MM_UL16",

			.rates = (SNDRV_PCM_RATE_8000_48000|

					SNDRV_PCM_RATE_KNOT),

			.formats = (SNDRV_PCM_FMTBIT_S16_LE |

				    SNDRV_PCM_FMTBIT_S24_LE |

				    SNDRV_PCM_FMTBIT_S24_3LE |

				    SNDRV_PCM_FMTBIT_S32_LE),

			.channels_min = 1,

			.channels_max = 8,

			.rate_min =     8000,

			.rate_max =     48000,

		},

		.ops = &msm_fe_Multimedia_dai_ops,

		.compress_new = snd_soc_new_compress,

		.name = "MultiMedia16",

		.probe = fe_dai_probe,

	},

sound/soc/msm/msm8996.c

+5 −4
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2014-2016, The Linux Foundation. All rights reserved.

 * Copyright (c) 2014-2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -2910,12 +2910,13 @@ static struct snd_soc_dai_link msm8996_common_dai_links[] = { 
		.be_id = MSM_FRONTEND_DAI_MULTIMEDIA15,

	},

	{

		.name = "MSM8996 Compress9",

		.stream_name = "Compress9",

		.name = "MSM8996 ULL NOIRQ_2",

		.stream_name = "MM_NOIRQ_2",

		.cpu_dai_name = "MultiMedia16",

		.platform_name = "msm-compress-dsp",

		.platform_name = "msm-pcm-dsp-noirq",

		.dynamic = 1,

		.dpcm_playback = 1,

		.dpcm_capture = 1,

		.trigger = {SND_SOC_DPCM_TRIGGER_POST,

			 SND_SOC_DPCM_TRIGGER_POST},

		.codec_dai_name = "snd-soc-dummy-dai",

sound/soc/msm/msm8998.c

+4 −3
Original line number Diff line number Diff line
@@ -5304,12 +5304,13 @@ static struct snd_soc_dai_link msm_common_dai_links[] = { 
		.be_id = MSM_FRONTEND_DAI_MULTIMEDIA15,

	},

	{

		.name = MSM_DAILINK_NAME(Compress9),

		.stream_name = "Compress9",

		.name = MSM_DAILINK_NAME(ULL_NOIRQ_2),

		.stream_name = "MM_NOIRQ_2",

		.cpu_dai_name = "MultiMedia16",

		.platform_name = "msm-compress-dsp",

		.platform_name = "msm-pcm-dsp-noirq",

		.dynamic = 1,

		.dpcm_playback = 1,

		.dpcm_capture = 1,

		.trigger = {SND_SOC_DPCM_TRIGGER_POST,

			 SND_SOC_DPCM_TRIGGER_POST},

		.codec_dai_name = "snd-soc-dummy-dai",

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

+148 −0
Original line number Diff line number Diff line
@@ -3640,6 +3640,11 @@ static const struct snd_kcontrol_new ext_ec_ref_mux_ul9 = 
		msm_route_ec_ref_rx_enum[0],

		msm_routing_ec_ref_rx_get, msm_routing_ec_ref_rx_put);













static const struct snd_kcontrol_new ext_ec_ref_mux_ul16 =













	SOC_DAPM_ENUM_EXT("AUDIO_REF_EC_UL16 MUX Mux",













		msm_route_ec_ref_rx_enum[0],













		msm_routing_ec_ref_rx_get, msm_routing_ec_ref_rx_put);



























static const struct snd_kcontrol_new ext_ec_ref_mux_ul17 =















	SOC_DAPM_ENUM_EXT("AUDIO_REF_EC_UL17 MUX Mux",















		msm_route_ec_ref_rx_enum[0],










@@ -7087,6 +7092,114 @@ static const struct snd_kcontrol_new mmul8_mixer_controls[] = {













	msm_routing_put_audio_mixer),















};



























static const struct snd_kcontrol_new mmul16_mixer_controls[] = {













	SOC_SINGLE_EXT("SLIM_0_TX", MSM_BACKEND_DAI_SLIMBUS_0_TX,













	MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,













	msm_routing_put_audio_mixer),













	SOC_SINGLE_EXT("PRI_MI2S_TX", MSM_BACKEND_DAI_PRI_MI2S_TX,













	MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,













	msm_routing_put_audio_mixer),













	SOC_SINGLE_EXT("SEC_MI2S_TX", MSM_BACKEND_DAI_SECONDARY_MI2S_TX,













	MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,













	msm_routing_put_audio_mixer),













	SOC_SINGLE_EXT("TERT_MI2S_TX", MSM_BACKEND_DAI_TERTIARY_MI2S_TX,













	MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,













	msm_routing_put_audio_mixer),













	SOC_SINGLE_EXT("INT2_MI2S_TX", MSM_BACKEND_DAI_INT2_MI2S_TX,













	MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,













	msm_routing_put_audio_mixer),













	SOC_SINGLE_EXT("INT3_MI2S_TX", MSM_BACKEND_DAI_INT3_MI2S_TX,













	MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,













	msm_routing_put_audio_mixer),













	SOC_SINGLE_EXT("QUAT_MI2S_TX", MSM_BACKEND_DAI_QUATERNARY_MI2S_TX,













	MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,













	msm_routing_put_audio_mixer),













	SOC_SINGLE_EXT("INTERNAL_FM_TX", MSM_BACKEND_DAI_INT_FM_TX,













	MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,













	msm_routing_put_audio_mixer),













	SOC_SINGLE_EXT("INTERNAL_BT_SCO_TX", MSM_BACKEND_DAI_INT_BT_SCO_TX,













	MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,













	msm_routing_put_audio_mixer),













	SOC_SINGLE_EXT("AFE_PCM_TX", MSM_BACKEND_DAI_AFE_PCM_TX,













	MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,













	msm_routing_put_audio_mixer),













	SOC_SINGLE_EXT("VOC_REC_DL", MSM_BACKEND_DAI_INCALL_RECORD_RX,













	MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,













	msm_routing_put_audio_mixer),













	SOC_SINGLE_EXT("VOC_REC_UL", MSM_BACKEND_DAI_INCALL_RECORD_TX,













	MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,













	msm_routing_put_audio_mixer),













	SOC_SINGLE_EXT("SLIM_6_TX", MSM_BACKEND_DAI_SLIMBUS_6_TX,













	MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,













	msm_routing_put_audio_mixer),













	SOC_SINGLE_EXT("PRI_TDM_TX_0", MSM_BACKEND_DAI_PRI_TDM_TX_0,













	MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,













	msm_routing_put_audio_mixer),













	SOC_SINGLE_EXT("PRI_TDM_TX_1", MSM_BACKEND_DAI_PRI_TDM_TX_1,













	MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,













	msm_routing_put_audio_mixer),













	SOC_SINGLE_EXT("PRI_TDM_TX_2", MSM_BACKEND_DAI_PRI_TDM_TX_2,













	MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,













	msm_routing_put_audio_mixer),













	SOC_SINGLE_EXT("PRI_TDM_TX_3", MSM_BACKEND_DAI_PRI_TDM_TX_3,













	MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,













	msm_routing_put_audio_mixer),













	SOC_SINGLE_EXT("SEC_TDM_TX_0", MSM_BACKEND_DAI_SEC_TDM_TX_0,













	MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,













	msm_routing_put_audio_mixer),













	SOC_SINGLE_EXT("SEC_TDM_TX_1", MSM_BACKEND_DAI_SEC_TDM_TX_1,













	MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,













	msm_routing_put_audio_mixer),













	SOC_SINGLE_EXT("SEC_TDM_TX_2", MSM_BACKEND_DAI_SEC_TDM_TX_2,













	MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,













	msm_routing_put_audio_mixer),













	SOC_SINGLE_EXT("SEC_TDM_TX_3", MSM_BACKEND_DAI_SEC_TDM_TX_3,













	MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,













	msm_routing_put_audio_mixer),













	SOC_SINGLE_EXT("TERT_TDM_TX_0", MSM_BACKEND_DAI_TERT_TDM_TX_0,













	MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,













	msm_routing_put_audio_mixer),













	SOC_SINGLE_EXT("TERT_TDM_TX_1", MSM_BACKEND_DAI_TERT_TDM_TX_1,













	MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,













	msm_routing_put_audio_mixer),













	SOC_SINGLE_EXT("TERT_TDM_TX_2", MSM_BACKEND_DAI_TERT_TDM_TX_2,













	MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,













	msm_routing_put_audio_mixer),













	SOC_SINGLE_EXT("TERT_TDM_TX_3", MSM_BACKEND_DAI_TERT_TDM_TX_3,













	MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,













	msm_routing_put_audio_mixer),













	SOC_SINGLE_EXT("QUAT_TDM_TX_0", MSM_BACKEND_DAI_QUAT_TDM_TX_0,













	MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,













	msm_routing_put_audio_mixer),













	SOC_SINGLE_EXT("QUAT_TDM_TX_1", MSM_BACKEND_DAI_QUAT_TDM_TX_1,













	MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,













	msm_routing_put_audio_mixer),













	SOC_SINGLE_EXT("QUAT_TDM_TX_2", MSM_BACKEND_DAI_QUAT_TDM_TX_2,













	MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,













	msm_routing_put_audio_mixer),













	SOC_SINGLE_EXT("QUAT_TDM_TX_3", MSM_BACKEND_DAI_QUAT_TDM_TX_3,













	MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,













	msm_routing_put_audio_mixer),













	SOC_SINGLE_EXT("SLIM_7_TX", MSM_BACKEND_DAI_SLIMBUS_7_TX,













	MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,













	msm_routing_put_audio_mixer),













	SOC_SINGLE_EXT("USB_AUDIO_TX", MSM_BACKEND_DAI_USB_TX,













	MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,













	msm_routing_put_audio_mixer),













	SOC_SINGLE_EXT("MI2S_TX", MSM_BACKEND_DAI_MI2S_TX,













	MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,













	msm_routing_put_audio_mixer),













	SOC_SINGLE_EXT("AUX_PCM_TX", MSM_BACKEND_DAI_AUXPCM_TX,













	MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,













	msm_routing_put_audio_mixer),













	SOC_SINGLE_EXT("SEC_AUX_PCM_TX", MSM_BACKEND_DAI_SEC_AUXPCM_TX,













	MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,













	msm_routing_put_audio_mixer),













	SOC_SINGLE_EXT("QUAT_AUX_PCM_TX", MSM_BACKEND_DAI_QUAT_AUXPCM_TX,













	MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,













	msm_routing_put_audio_mixer),













};



























static const struct snd_kcontrol_new mmul9_mixer_controls[] = {















	SOC_SINGLE_EXT("SLIM_0_TX", MSM_BACKEND_DAI_SLIMBUS_0_TX,















	MSM_FRONTEND_DAI_MULTIMEDIA9, 1, 0, msm_routing_get_audio_mixer,










@@ -11323,6 +11436,7 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = {













	SND_SOC_DAPM_AIF_OUT("MM_UL6", "MultiMedia6 Capture", 0, 0, 0, 0),















	SND_SOC_DAPM_AIF_OUT("MM_UL8", "MultiMedia8 Capture", 0, 0, 0, 0),















	SND_SOC_DAPM_AIF_OUT("MM_UL9", "MultiMedia9 Capture", 0, 0, 0, 0),













	SND_SOC_DAPM_AIF_OUT("MM_UL16", "MultiMedia16 Capture", 0, 0, 0, 0),















	SND_SOC_DAPM_AIF_OUT("MM_UL17", "MultiMedia17 Capture", 0, 0, 0, 0),















	SND_SOC_DAPM_AIF_OUT("MM_UL18", "MultiMedia18 Capture", 0, 0, 0, 0),















	SND_SOC_DAPM_AIF_OUT("MM_UL19", "MultiMedia19 Capture", 0, 0, 0, 0),










@@ -12059,6 +12173,8 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = {













	mmul8_mixer_controls, ARRAY_SIZE(mmul8_mixer_controls)),















	SND_SOC_DAPM_MIXER("MultiMedia9 Mixer", SND_SOC_NOPM, 0, 0,















	mmul9_mixer_controls, ARRAY_SIZE(mmul9_mixer_controls)),













	SND_SOC_DAPM_MIXER("MultiMedia16 Mixer", SND_SOC_NOPM, 0, 0,













	mmul16_mixer_controls, ARRAY_SIZE(mmul16_mixer_controls)),















	SND_SOC_DAPM_MIXER("MultiMedia17 Mixer", SND_SOC_NOPM, 0, 0,















	mmul17_mixer_controls, ARRAY_SIZE(mmul17_mixer_controls)),















	SND_SOC_DAPM_MIXER("MultiMedia18 Mixer", SND_SOC_NOPM, 0, 0,










@@ -12389,6 +12505,8 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = {













		&ext_ec_ref_mux_ul8),















	SND_SOC_DAPM_MUX("AUDIO_REF_EC_UL9 MUX", SND_SOC_NOPM, 0, 0,















		&ext_ec_ref_mux_ul9),













	SND_SOC_DAPM_MUX("AUDIO_REF_EC_UL16 MUX", SND_SOC_NOPM, 0, 0,













		&ext_ec_ref_mux_ul16),















	SND_SOC_DAPM_MUX("AUDIO_REF_EC_UL17 MUX", SND_SOC_NOPM, 0, 0,















		&ext_ec_ref_mux_ul17),















	SND_SOC_DAPM_MUX("AUDIO_REF_EC_UL18 MUX", SND_SOC_NOPM, 0, 0,










@@ -12640,6 +12758,7 @@ static const struct snd_soc_dapm_route intercon[] = {













	{"MultiMedia8 Mixer", "INT3_MI2S_TX", "INT3_MI2S_TX"},















	{"MultiMedia3 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},















	{"MultiMedia5 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},













	{"MultiMedia16 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},















	{"MultiMedia5 Mixer", "SLIM_7_TX", "SLIMBUS_7_TX"},















	{"MultiMedia5 Mixer", "SLIM_8_TX", "SLIMBUS_8_TX"},















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










@@ -13208,6 +13327,7 @@ static const struct snd_soc_dapm_route intercon[] = {













	{"MultiMedia2 Mixer", "MI2S_TX", "MI2S_TX"},















	{"MultiMedia3 Mixer", "MI2S_TX", "MI2S_TX"},















	{"MultiMedia5 Mixer", "MI2S_TX", "MI2S_TX"},













	{"MultiMedia16 Mixer", "MI2S_TX", "MI2S_TX"},















	{"MultiMedia1 Mixer", "QUAT_MI2S_TX", "QUAT_MI2S_TX"},















	{"MultiMedia2 Mixer", "QUAT_MI2S_TX", "QUAT_MI2S_TX"},















	{"MultiMedia6 Mixer", "QUAT_MI2S_TX", "QUAT_MI2S_TX"},









@@ -13226,12 +13346,15 @@ static const struct snd_soc_dapm_route intercon[] = {













	{"MultiMedia1 Mixer", "SEC_AUX_PCM_UL_TX", "SEC_AUX_PCM_TX"},















	{"MultiMedia3 Mixer", "SEC_AUX_PCM_TX", "SEC_AUX_PCM_TX"},















	{"MultiMedia5 Mixer", "SEC_AUX_PCM_TX", "SEC_AUX_PCM_TX"},













	{"MultiMedia16 Mixer", "AUX_PCM_TX", "AUX_PCM_TX"},













	{"MultiMedia16 Mixer", "SEC_AUX_PCM_TX", "SEC_AUX_PCM_TX"},















	{"MultiMedia1 Mixer", "TERT_AUXPCM_UL_TX", "TERT_AUX_PCM_TX"},















	{"MultiMedia3 Mixer", "TERT_AUX_PCM_TX", "TERT_AUX_PCM_TX"},















	{"MultiMedia5 Mixer", "TERT_AUX_PCM_TX", "TERT_AUX_PCM_TX"},















	{"MultiMedia1 Mixer", "QUAT_AUXPCM_UL_TX", "QUAT_AUX_PCM_TX"},















	{"MultiMedia3 Mixer", "QUAT_AUX_PCM_TX", "QUAT_AUX_PCM_TX"},















	{"MultiMedia5 Mixer", "QUAT_AUX_PCM_TX", "QUAT_AUX_PCM_TX"},













	{"MultiMedia16 Mixer", "QUAT_AUX_PCM_TX", "QUAT_AUX_PCM_TX"},















	{"MultiMedia2 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},















	{"MultiMedia2 Mixer", "SLIM_6_TX", "SLIMBUS_6_TX"},















	{"MultiMedia2 Mixer", "SLIM_1_TX", "SLIMBUS_1_TX"},









@@ -13246,9 +13369,11 @@ static const struct snd_soc_dapm_route intercon[] = {













	{"MultiMedia6 Mixer", "INT2_MI2S_TX", "INT2_MI2S_TX"},















	{"MultiMedia3 Mixer", "INT2_MI2S_TX", "INT2_MI2S_TX"},















	{"MultiMedia5 Mixer", "INT2_MI2S_TX", "INT2_MI2S_TX"},













	{"MultiMedia16 Mixer", "INT2_MI2S_TX", "INT2_MI2S_TX"},















	{"MultiMedia6 Mixer", "INT3_MI2S_TX", "INT3_MI2S_TX"},















	{"MultiMedia3 Mixer", "INT3_MI2S_TX", "INT3_MI2S_TX"},















	{"MultiMedia5 Mixer", "INT3_MI2S_TX", "INT3_MI2S_TX"},













	{"MultiMedia16 Mixer", "INT3_MI2S_TX", "INT3_MI2S_TX"},















	{"MultiMedia6 Mixer", "PRI_MI2S_TX", "PRI_MI2S_TX"},















	{"MultiMedia6 Mixer", "AUX_PCM_UL_TX", "AUX_PCM_TX"},















	{"MultiMedia6 Mixer", "SEC_AUX_PCM_UL_TX", "SEC_AUX_PCM_TX"},










@@ -13410,6 +13535,24 @@ static const struct snd_soc_dapm_route intercon[] = {













	{"MultiMedia6 Mixer", "USB_AUDIO_TX", "USB_AUDIO_TX"},















	{"MultiMedia8 Mixer", "USB_AUDIO_TX", "USB_AUDIO_TX"},



























	{"MultiMedia16 Mixer", "PRI_TDM_TX_0", "PRI_TDM_TX_0"},













	{"MultiMedia16 Mixer", "PRI_TDM_TX_1", "PRI_TDM_TX_1"},













	{"MultiMedia16 Mixer", "PRI_TDM_TX_2", "PRI_TDM_TX_2"},













	{"MultiMedia16 Mixer", "PRI_TDM_TX_3", "PRI_TDM_TX_3"},













	{"MultiMedia16 Mixer", "SEC_TDM_TX_0", "SEC_TDM_TX_0"},













	{"MultiMedia16 Mixer", "SEC_TDM_TX_1", "SEC_TDM_TX_1"},













	{"MultiMedia16 Mixer", "SEC_TDM_TX_2", "SEC_TDM_TX_2"},













	{"MultiMedia16 Mixer", "SEC_TDM_TX_3", "SEC_TDM_TX_3"},













	{"MultiMedia16 Mixer", "TERT_TDM_TX_0", "TERT_TDM_TX_0"},













	{"MultiMedia16 Mixer", "TERT_TDM_TX_1", "TERT_TDM_TX_1"},













	{"MultiMedia16 Mixer", "TERT_TDM_TX_2", "TERT_TDM_TX_2"},













	{"MultiMedia16 Mixer", "TERT_TDM_TX_3", "TERT_TDM_TX_3"},













	{"MultiMedia16 Mixer", "QUAT_TDM_TX_0", "QUAT_TDM_TX_0"},













	{"MultiMedia16 Mixer", "QUAT_TDM_TX_1", "QUAT_TDM_TX_1"},













	{"MultiMedia16 Mixer", "QUAT_TDM_TX_2", "QUAT_TDM_TX_2"},













	{"MultiMedia16 Mixer", "QUAT_TDM_TX_3", "QUAT_TDM_TX_3"},













	{"MultiMedia16 Mixer", "USB_AUDIO_TX", "USB_AUDIO_TX"},



























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















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















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










@@ -13492,8 +13635,10 @@ static const struct snd_soc_dapm_route intercon[] = {













	{"MultiMedia19 Mixer", "INTERNAL_BT_SCO_TX", "INT_BT_SCO_TX"},















	{"MultiMedia5 Mixer", "INTERNAL_BT_SCO_TX", "INT_BT_SCO_TX"},















	{"MultiMedia8 Mixer", "INTERNAL_BT_SCO_TX", "INT_BT_SCO_TX"},













	{"MultiMedia16 Mixer", "INTERNAL_BT_SCO_TX", "INT_BT_SCO_TX"},















	{"MultiMedia1 Mixer", "INTERNAL_FM_TX", "INT_FM_TX"},















	{"MultiMedia4 Mixer", "INTERNAL_FM_TX", "INT_FM_TX"},













	{"MultiMedia16 Mixer", "INTERNAL_FM_TX", "INT_FM_TX"},















	{"MultiMedia17 Mixer", "INTERNAL_FM_TX", "INT_FM_TX"},















	{"MultiMedia18 Mixer", "INTERNAL_FM_TX", "INT_FM_TX"},















	{"MultiMedia19 Mixer", "INTERNAL_FM_TX", "INT_FM_TX"},









@@ -13509,6 +13654,7 @@ static const struct snd_soc_dapm_route intercon[] = {













	{"MultiMedia19 Mixer", "AFE_PCM_TX", "PCM_TX"},















	{"MultiMedia5 Mixer", "AFE_PCM_TX", "PCM_TX"},















	{"MultiMedia8 Mixer", "AFE_PCM_TX", "PCM_TX"},













	{"MultiMedia16 Mixer", "AFE_PCM_TX", "PCM_TX"},















	{"MM_UL1", NULL, "MultiMedia1 Mixer"},















	{"MultiMedia2 Mixer", "INTERNAL_FM_TX", "INT_FM_TX"},















	{"MM_UL2", NULL, "MultiMedia2 Mixer"},









@@ -13518,6 +13664,7 @@ static const struct snd_soc_dapm_route intercon[] = {













	{"MM_UL6", NULL, "MultiMedia6 Mixer"},















	{"MM_UL8", NULL, "MultiMedia8 Mixer"},















	{"MM_UL9", NULL, "MultiMedia9 Mixer"},













	{"MM_UL16", NULL, "MultiMedia16 Mixer"},















	{"MM_UL17", NULL, "MultiMedia17 Mixer"},















	{"MM_UL18", NULL, "MultiMedia18 Mixer"},















	{"MM_UL19", NULL, "MultiMedia19 Mixer"},










@@ -13928,6 +14075,7 @@ static const struct snd_soc_dapm_route intercon[] = {













	{"MM_UL6", NULL, "AUDIO_REF_EC_UL6 MUX"},















	{"MM_UL8", NULL, "AUDIO_REF_EC_UL8 MUX"},















	{"MM_UL9", NULL, "AUDIO_REF_EC_UL9 MUX"},













	{"MM_UL16", NULL, "AUDIO_REF_EC_UL16 MUX"},















	{"MM_UL17", NULL, "AUDIO_REF_EC_UL17 MUX"},















	{"MM_UL18", NULL, "AUDIO_REF_EC_UL18 MUX"},















	{"MM_UL19", NULL, "AUDIO_REF_EC_UL19 MUX"},