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

Commit 32680667 authored by Kuirong Wang's avatar Kuirong Wang Committed by Gerrit - the friendly Code Review server
Browse files

ASoC: msm: Update slimbus RX 6 routing and add hostless 



Update the slimbus RX 6 routing and add the slimbus RX6 hostless
to support more use cases.

CRs-fixed: 940415
Change-Id: I4fcea97cc4a0c876609fbaa8f5eecf3b4914e776
Signed-off-by: default avatarKuirong Wang <kuirongw@codeaurora.org>
parent a29373a5

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

+17 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2016, 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
@@ -458,6 +458,22 @@ static struct snd_soc_dai_driver msm_fe_dais[] = { 
		.name = "SLIMBUS4_HOSTLESS",

		.probe = fe_dai_probe,

	},

	{

		.playback = {

			.stream_name = "SLIMBUS6_HOSTLESS Playback",

			.aif_name = "SLIM6_DL_HL",

			.rates = SNDRV_PCM_RATE_8000_192000,

			.formats = (SNDRV_PCM_FMTBIT_S16_LE |

				    SNDRV_PCM_FMTBIT_S24_LE),

			.channels_min = 1,

			.channels_max = 8,

			.rate_min =     8000,

			.rate_max =     192000,

		},

		.ops = &msm_fe_dai_ops,

		.name = "SLIMBUS6_HOSTLESS",

		.probe = fe_dai_probe,

	},

	{

		.playback = {

			.stream_name = "INT_FM_HOSTLESS Playback",

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

+171 −2
Original line number Diff line number Diff line
@@ -1830,6 +1830,10 @@ static int msm_routing_ec_ref_rx_put(struct snd_kcontrol *kcontrol, 
		msm_route_ec_ref_rx = 14;

		ec_ref_port_id = AFE_PORT_ID_QUATERNARY_TDM_RX_2;

		break;

	case 15:

		msm_route_ec_ref_rx = 15;

		ec_ref_port_id = SLIMBUS_6_RX;

		break;

	default:

		msm_route_ec_ref_rx = 0; /* NONE */

		pr_err("%s EC ref rx %ld not valid\n",
@@ -1849,9 +1853,9 @@ static const char *const ec_ref_rx[] = { "None", "SLIM_RX", "I2S_RX", 
	"PRI_MI2S_TX", "SEC_MI2S_TX",

	"TERT_MI2S_TX", "QUAT_MI2S_TX", "SEC_I2S_RX", "PROXY_RX",

	"SLIM_5_RX", "SLIM_1_TX", "QUAT_TDM_TX_1",

	"QUAT_TDM_RX_0", "QUAT_TDM_RX_1", "QUAT_TDM_RX_2"};

	"QUAT_TDM_RX_0", "QUAT_TDM_RX_1", "QUAT_TDM_RX_2", "SLIM_6_RX"};

static const struct soc_enum msm_route_ec_ref_rx_enum[] = {

	SOC_ENUM_SINGLE_EXT(15, ec_ref_rx),

	SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(ec_ref_rx), ec_ref_rx),

};



static const struct snd_kcontrol_new ext_ec_ref_mux_ul1 =
@@ -2632,12 +2636,48 @@ static const struct snd_kcontrol_new slimbus_6_rx_mixer_controls[] = { 
	SOC_SINGLE_EXT("MultiMedia2", MSM_BACKEND_DAI_SLIMBUS_6_RX,

	MSM_FRONTEND_DAI_MULTIMEDIA2, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("MultiMedia3", MSM_BACKEND_DAI_SLIMBUS_6_RX,

	MSM_FRONTEND_DAI_MULTIMEDIA3, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("MultiMedia4", MSM_BACKEND_DAI_SLIMBUS_6_RX,

	MSM_FRONTEND_DAI_MULTIMEDIA4, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("MultiMedia5", MSM_BACKEND_DAI_SLIMBUS_6_RX,

	MSM_FRONTEND_DAI_MULTIMEDIA5, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("MultiMedia6", MSM_BACKEND_DAI_SLIMBUS_6_RX,

	MSM_FRONTEND_DAI_MULTIMEDIA6, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("MultiMedia7", MSM_BACKEND_DAI_SLIMBUS_6_RX,

	MSM_FRONTEND_DAI_MULTIMEDIA7, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("MultiMedia8", MSM_BACKEND_DAI_SLIMBUS_6_RX,

	MSM_FRONTEND_DAI_MULTIMEDIA8, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("MultiMedia9", MSM_BACKEND_DAI_SLIMBUS_6_RX,

	MSM_FRONTEND_DAI_MULTIMEDIA9, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("MultiMedia10", MSM_BACKEND_DAI_SLIMBUS_6_RX,

	MSM_FRONTEND_DAI_MULTIMEDIA10, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("MultiMedia11", MSM_BACKEND_DAI_SLIMBUS_6_RX,

	MSM_FRONTEND_DAI_MULTIMEDIA11, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("MultiMedia12", MSM_BACKEND_DAI_SLIMBUS_6_RX,

	MSM_FRONTEND_DAI_MULTIMEDIA12, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("MultiMedia13", MSM_BACKEND_DAI_SLIMBUS_6_RX,

	MSM_FRONTEND_DAI_MULTIMEDIA13, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("MultiMedia14", MSM_BACKEND_DAI_SLIMBUS_6_RX,

	MSM_FRONTEND_DAI_MULTIMEDIA14, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("MultiMedia15", MSM_BACKEND_DAI_SLIMBUS_6_RX,

	MSM_FRONTEND_DAI_MULTIMEDIA15, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("MultiMedia16", MSM_BACKEND_DAI_SLIMBUS_6_RX,

	MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

};



static const struct snd_kcontrol_new int_bt_sco_rx_mixer_controls[] = {
@@ -3744,6 +3784,45 @@ static const struct snd_kcontrol_new slimbus_rx_voice_mixer_controls[] = { 
	msm_routing_put_voice_mixer),

};



static const struct snd_kcontrol_new slimbus_6_rx_voice_mixer_controls[] = {

	SOC_SINGLE_EXT("CSVoice", MSM_BACKEND_DAI_SLIMBUS_6_RX,

	MSM_FRONTEND_DAI_CS_VOICE, 1, 0, msm_routing_get_voice_mixer,

	msm_routing_put_voice_mixer),

	SOC_SINGLE_EXT("Voice2", MSM_BACKEND_DAI_SLIMBUS_6_RX,

	MSM_FRONTEND_DAI_VOICE2, 1, 0, msm_routing_get_voice_mixer,

	msm_routing_put_voice_mixer),

	SOC_SINGLE_EXT("Voip", MSM_BACKEND_DAI_SLIMBUS_6_RX ,

	MSM_FRONTEND_DAI_VOIP, 1, 0, msm_routing_get_voice_mixer,

	msm_routing_put_voice_mixer),

	SOC_SINGLE_EXT("Voice Stub", MSM_BACKEND_DAI_SLIMBUS_6_RX,

	MSM_FRONTEND_DAI_VOICE_STUB, 1, 0, msm_routing_get_voice_stub_mixer,

	msm_routing_put_voice_stub_mixer),

	SOC_SINGLE_EXT("Voice2 Stub", MSM_BACKEND_DAI_SLIMBUS_6_RX,

	MSM_FRONTEND_DAI_VOICE2_STUB, 1, 0, msm_routing_get_voice_stub_mixer,

	msm_routing_put_voice_stub_mixer),

	SOC_SINGLE_EXT("VoLTE", MSM_BACKEND_DAI_SLIMBUS_6_RX ,

	MSM_FRONTEND_DAI_VOLTE, 1, 0, msm_routing_get_voice_mixer,

	msm_routing_put_voice_mixer),

	SOC_SINGLE_EXT("VoLTE Stub", MSM_BACKEND_DAI_SLIMBUS_6_RX,

	MSM_FRONTEND_DAI_VOLTE_STUB, 1, 0, msm_routing_get_voice_stub_mixer,

	msm_routing_put_voice_stub_mixer),

	SOC_SINGLE_EXT("VoWLAN", MSM_BACKEND_DAI_SLIMBUS_6_RX ,

	MSM_FRONTEND_DAI_VOWLAN, 1, 0, msm_routing_get_voice_mixer,

	msm_routing_put_voice_mixer),

	SOC_SINGLE_EXT("DTMF", MSM_BACKEND_DAI_SLIMBUS_6_RX ,

	MSM_FRONTEND_DAI_DTMF_RX, 1, 0, msm_routing_get_voice_mixer,

	msm_routing_put_voice_mixer),

	SOC_SINGLE_EXT("QCHAT", MSM_BACKEND_DAI_SLIMBUS_6_RX ,

	MSM_FRONTEND_DAI_QCHAT, 1, 0, msm_routing_get_voice_mixer,

	msm_routing_put_voice_mixer),

	SOC_SINGLE_EXT("VoiceMMode1", MSM_BACKEND_DAI_SLIMBUS_6_RX,

	MSM_FRONTEND_DAI_VOICEMMODE1, 1, 0, msm_routing_get_voice_mixer,

	msm_routing_put_voice_mixer),

	SOC_SINGLE_EXT("VoiceMMode2", MSM_BACKEND_DAI_SLIMBUS_6_RX,

	MSM_FRONTEND_DAI_VOICEMMODE2, 1, 0, msm_routing_get_voice_mixer,

	msm_routing_put_voice_mixer),

};



static const struct snd_kcontrol_new bt_sco_rx_voice_mixer_controls[] = {

	SOC_SINGLE_EXT("CSVoice", MSM_BACKEND_DAI_INT_BT_SCO_RX,

	MSM_FRONTEND_DAI_CS_VOICE, 1, 0, msm_routing_get_voice_mixer,
@@ -4540,6 +4619,40 @@ static const struct snd_kcontrol_new sbus_3_rx_port_mixer_controls[] = { 
	MSM_BACKEND_DAI_SLIMBUS_0_RX, 1, 0, msm_routing_get_port_mixer,

	msm_routing_put_port_mixer),

};



static const struct snd_kcontrol_new sbus_6_rx_port_mixer_controls[] = {

	SOC_SINGLE_EXT("INTERNAL_FM_TX", MSM_BACKEND_DAI_SLIMBUS_6_RX,

	MSM_BACKEND_DAI_INT_FM_TX, 1, 0, msm_routing_get_port_mixer,

	msm_routing_put_port_mixer),

	SOC_SINGLE_EXT("SLIM_0_TX", MSM_BACKEND_DAI_SLIMBUS_6_RX,

	MSM_BACKEND_DAI_SLIMBUS_0_TX, 1, 0, msm_routing_get_port_mixer,

	msm_routing_put_port_mixer),

	SOC_SINGLE_EXT("SLIM_1_TX", MSM_BACKEND_DAI_SLIMBUS_6_RX,

	MSM_BACKEND_DAI_SLIMBUS_1_TX, 1, 0, msm_routing_get_port_mixer,

	msm_routing_put_port_mixer),

	SOC_SINGLE_EXT("AUX_PCM_UL_TX", MSM_BACKEND_DAI_SLIMBUS_6_RX,

	MSM_BACKEND_DAI_AUXPCM_TX, 1, 0, msm_routing_get_port_mixer,

	msm_routing_put_port_mixer),

	SOC_SINGLE_EXT("SEC_AUX_PCM_UL_TX", MSM_BACKEND_DAI_SLIMBUS_6_RX,

	MSM_BACKEND_DAI_SEC_AUXPCM_TX, 1, 0, msm_routing_get_port_mixer,

	msm_routing_put_port_mixer),

	SOC_SINGLE_EXT("MI2S_TX", MSM_BACKEND_DAI_SLIMBUS_6_RX,

	MSM_BACKEND_DAI_MI2S_TX, 1, 0, msm_routing_get_port_mixer,

	msm_routing_put_port_mixer),

	SOC_SINGLE_EXT("PRI_MI2S_TX", MSM_BACKEND_DAI_SLIMBUS_6_RX,

	MSM_BACKEND_DAI_PRI_MI2S_TX, 1, 0, msm_routing_get_port_mixer,

	msm_routing_put_port_mixer),

	SOC_SINGLE_EXT("TERT_MI2S_TX", MSM_BACKEND_DAI_SLIMBUS_6_RX,

	MSM_BACKEND_DAI_TERTIARY_MI2S_TX, 1, 0, msm_routing_get_port_mixer,

	msm_routing_put_port_mixer),

	SOC_SINGLE_EXT("QUAT_MI2S_TX", MSM_BACKEND_DAI_SLIMBUS_6_RX,

	MSM_BACKEND_DAI_QUATERNARY_MI2S_TX, 1, 0, msm_routing_get_port_mixer,

	msm_routing_put_port_mixer),

	SOC_SINGLE_EXT("INTERNAL_BT_SCO_TX", MSM_BACKEND_DAI_SLIMBUS_6_RX,

	MSM_BACKEND_DAI_INT_BT_SCO_TX, 1, 0, msm_routing_get_port_mixer,

	msm_routing_put_port_mixer),

};



static const struct snd_kcontrol_new bt_sco_rx_port_mixer_controls[] = {

	SOC_SINGLE_EXT("SLIM_1_TX", MSM_BACKEND_DAI_INT_BT_SCO_RX,

	MSM_BACKEND_DAI_SLIMBUS_1_TX, 1, 0, msm_routing_get_port_mixer,
@@ -5175,6 +5288,11 @@ static const struct snd_kcontrol_new slim4_fm_switch_mixer_controls = 
	0, 1, 0, msm_routing_get_switch_mixer,

	msm_routing_put_switch_mixer);



static const struct snd_kcontrol_new slim6_fm_switch_mixer_controls =

	SOC_SINGLE_EXT("Switch", SND_SOC_NOPM,

	0, 1, 0, msm_routing_get_switch_mixer,

	msm_routing_put_switch_mixer);



static const struct snd_kcontrol_new pcm_rx_switch_mixer_controls =

	SOC_SINGLE_EXT("Switch", SND_SOC_NOPM,

	0, 1, 0, msm_routing_get_fm_pcmrx_switch_mixer,
@@ -6079,6 +6197,8 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = { 
		0, 0, 0, 0),

	SND_SOC_DAPM_AIF_OUT("SLIM4_UL_HL", "SLIMBUS4_HOSTLESS Capture",

		0, 0, 0, 0),

	SND_SOC_DAPM_AIF_IN("SLIM6_DL_HL", "SLIMBUS6_HOSTLESS Playback",

		0, 0, 0, 0),

	SND_SOC_DAPM_AIF_IN("INTFM_DL_HL", "INT_FM_HOSTLESS Playback",

		0, 0, 0, 0),

	SND_SOC_DAPM_AIF_OUT("INTFM_UL_HL", "INT_FM_HOSTLESS Capture",
@@ -6560,6 +6680,8 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = { 
				&slim3_fm_switch_mixer_controls),

	SND_SOC_DAPM_SWITCH("SLIMBUS4_DL_HL", SND_SOC_NOPM, 0, 0,

				&slim4_fm_switch_mixer_controls),

	SND_SOC_DAPM_SWITCH("SLIMBUS6_DL_HL", SND_SOC_NOPM, 0, 0,

				&slim6_fm_switch_mixer_controls),

	SND_SOC_DAPM_SWITCH("PCM_RX_DL_HL", SND_SOC_NOPM, 0, 0,

				&pcm_rx_switch_mixer_controls),

	SND_SOC_DAPM_SWITCH("PRI_MI2S_RX_DL_HL", SND_SOC_NOPM, 0, 0,
@@ -6766,6 +6888,10 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = { 
	slimbus_1_rx_mixer_controls, ARRAY_SIZE(slimbus_1_rx_mixer_controls)),

	SND_SOC_DAPM_MIXER("SLIMBUS_3_RX_Voice Mixer", SND_SOC_NOPM, 0, 0,

	slimbus_3_rx_mixer_controls, ARRAY_SIZE(slimbus_3_rx_mixer_controls)),

	SND_SOC_DAPM_MIXER("SLIM_6_RX_Voice Mixer",

			SND_SOC_NOPM, 0, 0,

			slimbus_6_rx_voice_mixer_controls,

			ARRAY_SIZE(slimbus_6_rx_voice_mixer_controls)),

	/* port mixer */

	SND_SOC_DAPM_MIXER("SLIMBUS_0_RX Port Mixer",

	SND_SOC_NOPM, 0, 0, sbus_0_rx_port_mixer_controls,
@@ -6794,6 +6920,9 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = { 
	SND_SOC_DAPM_MIXER("SLIMBUS_3_RX Port Mixer",

	SND_SOC_NOPM, 0, 0, sbus_3_rx_port_mixer_controls,

	ARRAY_SIZE(sbus_3_rx_port_mixer_controls)),

	SND_SOC_DAPM_MIXER("SLIMBUS_6_RX Port Mixer",

	SND_SOC_NOPM, 0, 0, sbus_6_rx_port_mixer_controls,

	ARRAY_SIZE(sbus_6_rx_port_mixer_controls)),

	SND_SOC_DAPM_MIXER("MI2S_RX Port Mixer", SND_SOC_NOPM, 0, 0,

	mi2s_rx_port_mixer_controls, ARRAY_SIZE(mi2s_rx_port_mixer_controls)),

	SND_SOC_DAPM_MIXER("PRI_MI2S_RX Port Mixer", SND_SOC_NOPM, 0, 0,
@@ -6983,10 +7112,23 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"SLIMBUS_4_RX Audio Mixer", "MultiMedia5", "MM_DL5"},

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

	{"SLIMBUS_4_RX", NULL, "SLIMBUS_4_RX Audio Mixer"},



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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

	{"SLIMBUS_6_RX", NULL, "SLIMBUS_6_RX Audio Mixer"},



	{"MultiMedia1 Mixer", "VOC_REC_UL", "INCALL_RECORD_TX"},
@@ -7501,6 +7643,20 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"SLIM_0_RX_Voice Mixer", "VoiceMMode2", "VOICEMMODE2_DL"},

	{"SLIMBUS_0_RX", NULL, "SLIM_0_RX_Voice Mixer"},



	{"SLIM_6_RX_Voice Mixer", "CSVoice", "CS-VOICE_DL1"},

	{"SLIM_6_RX_Voice Mixer", "Voice2", "VOICE2_DL"},

	{"SLIM_6_RX_Voice Mixer", "VoLTE", "VoLTE_DL"},

	{"SLIM_6_RX_Voice Mixer", "VoWLAN", "VoWLAN_DL"},

	{"SLIM_6_RX_Voice Mixer", "Voip", "VOIP_DL"},

	{"SLIM_6_RX_Voice Mixer", "DTMF", "DTMF_DL_HL"},

	{"SLIM_6_RX_Voice Mixer", "Voice Stub", "VOICE_STUB_DL"},

	{"SLIM_6_RX_Voice Mixer", "Voice2 Stub", "VOICE2_STUB_DL"},

	{"SLIM_6_RX_Voice Mixer", "VoLTE Stub", "VOLTE_STUB_DL"},

	{"SLIM_6_RX_Voice Mixer", "QCHAT", "QCHAT_DL"},

	{"SLIM_6_RX_Voice Mixer", "VoiceMMode1", "VOICEMMODE1_DL"},

	{"SLIM_6_RX_Voice Mixer", "VoiceMMode2", "VOICEMMODE2_DL"},

	{"SLIMBUS_6_RX", NULL, "SLIM_6_RX_Voice Mixer"},



	{"INTERNAL_BT_SCO_RX_Voice Mixer", "CSVoice", "CS-VOICE_DL1"},

	{"INTERNAL_BT_SCO_RX_Voice Mixer", "Voice2", "VOICE2_DL"},

	{"INTERNAL_BT_SCO_RX_Voice Mixer", "VoLTE", "VoLTE_DL"},
@@ -7751,6 +7907,8 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"SLIMBUS_3_RX", NULL, "SLIMBUS3_DL_HL"},

	{"SLIMBUS4_DL_HL", "Switch", "SLIM4_DL_HL"},

	{"SLIMBUS_4_RX", NULL, "SLIMBUS4_DL_HL"},

	{"SLIMBUS6_DL_HL", "Switch", "SLIM6_DL_HL"},

	{"SLIMBUS_6_RX", NULL, "SLIMBUS6_DL_HL"},

	{"SLIM0_UL_HL", NULL, "SLIMBUS_0_TX"},

	{"SLIM1_UL_HL", NULL, "SLIMBUS_1_TX"},

	{"SLIM3_UL_HL", NULL, "SLIMBUS_3_TX"},
@@ -8116,6 +8274,17 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"SLIMBUS_3_RX Port Mixer", "SLIM_0_RX", "SLIMBUS_0_RX"},

	{"SLIMBUS_3_RX", NULL, "SLIMBUS_3_RX Port Mixer"},



	{"SLIMBUS_6_RX Port Mixer", "INTERNAL_FM_TX", "INT_FM_TX"},

	{"SLIMBUS_6_RX Port Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},

	{"SLIMBUS_6_RX Port Mixer", "SLIM_1_TX", "SLIMBUS_1_TX"},

	{"SLIMBUS_6_RX Port Mixer", "AUX_PCM_UL_TX", "AUX_PCM_TX"},

	{"SLIMBUS_6_RX Port Mixer", "SEC_AUX_PCM_UL_TX", "SEC_AUX_PCM_TX"},

	{"SLIMBUS_6_RX Port Mixer", "MI2S_TX", "MI2S_TX"},

	{"SLIMBUS_6_RX Port Mixer", "PRI_MI2S_TX", "PRI_MI2S_TX"},

	{"SLIMBUS_6_RX Port Mixer", "TERT_MI2S_TX", "TERT_MI2S_TX"},

	{"SLIMBUS_6_RX Port Mixer", "QUAT_MI2S_TX", "QUAT_MI2S_TX"},

	{"SLIMBUS_6_RX Port Mixer", "INTERNAL_BT_SCO_TX", "INT_BT_SCO_TX"},

	{"SLIMBUS_6_RX", NULL, "SLIMBUS_6_RX Port Mixer"},



	{"HDMI_RX Port Mixer", "MI2S_TX", "MI2S_TX"},

	{"HDMI", NULL, "HDMI_RX Port Mixer"},