Merge "ASoC: msm8952: add new backends for RX and TX" (04d53e49) · Commits · e / devices / android_kernel_xiaomi_markw

sound/soc/msm/msm8952-dai-links.c

+15 −1

Original line number	Diff line number	Diff line
		@@ -223,6 +223,20 @@ static struct snd_soc_dai_link msm8952_tasha_be_dai[] = {
		.ops = &msm8952_slimbus_be_ops,
		.ignore_suspend = 1,
		},
		{
		.name = LPASS_BE_SLIMBUS_2_TX,
		.stream_name = "Slimbus2 Capture",
		.cpu_dai_name = "msm-dai-q6-dev.16389",
		.platform_name = "msm-pcm-routing",
		.codec_name = "tasha_codec",
		.codec_dai_name = "tasha_tx4",
		.no_pcm = 1,
		.dpcm_capture = 1,
		.be_id = MSM_BACKEND_DAI_SLIMBUS_2_TX,
		.be_hw_params_fixup = msm_slim_2_tx_be_hw_params_fixup,
		.ops = &msm8952_slimbus_be_ops,
		.ignore_suspend = 1,
		},
		{
		.name = LPASS_BE_SLIMBUS_3_RX,
		.stream_name = "Slimbus3 Playback",
		@@ -259,7 +273,7 @@ static struct snd_soc_dai_link msm8952_tasha_be_dai[] = {
		.cpu_dai_name = "msm-dai-q6-dev.16392",
		.platform_name = "msm-pcm-routing",
		.codec_name = "tasha_codec",
		.codec_dai_name = "tasha_mix_rx1",
		.codec_dai_name = "tasha_rx5",
		.no_pcm = 1,
		.dpcm_playback = 1,
		.be_id = MSM_BACKEND_DAI_SLIMBUS_4_RX,

sound/soc/msm/msm8952-slimbus.c

+97 −0

Original line number	Diff line number	Diff line
		@@ -92,9 +92,11 @@ static int slim1_tx_sample_rate = SAMPLING_RATE_48KHZ;
		static int slim0_rx_bit_format = SNDRV_PCM_FORMAT_S16_LE;
		static int slim0_tx_bit_format = SNDRV_PCM_FORMAT_S16_LE;
		static int slim1_tx_bit_format = SNDRV_PCM_FORMAT_S16_LE;
		static int slim2_tx_bit_format = SNDRV_PCM_FORMAT_S16_LE;
		static int msm_slim_0_rx_ch = 1;
		static int msm_slim_0_tx_ch = 1;
		static int msm_slim_1_tx_ch = 1;
		static int msm_slim_2_tx_ch = 1;
		static int msm_vi_feed_tx_ch = 2;
		static int msm_slim_5_rx_ch = 1;
		static int msm_slim_6_rx_ch = 1;
		@@ -951,6 +953,51 @@ static int slim0_tx_bit_format_put(struct snd_kcontrol *kcontrol,
		return rc;
		}

		static int slim2_tx_bit_format_get(struct snd_kcontrol *kcontrol,
		struct snd_ctl_elem_value *ucontrol)
		{
		switch (slim2_tx_bit_format) {
		case SNDRV_PCM_FORMAT_S24_3LE:
		ucontrol->value.integer.value[0] = 2;
		break;
		case SNDRV_PCM_FORMAT_S24_LE:
		ucontrol->value.integer.value[0] = 1;
		break;
		case SNDRV_PCM_FORMAT_S16_LE:
		default:
		ucontrol->value.integer.value[0] = 0;
		break;
		}
		pr_debug("%s: slim2_tx_bit_format = %d, ucontrol value = %ld\n",
		__func__, slim2_tx_bit_format,
		ucontrol->value.integer.value[0]);
		return 0;
		}

		static int slim2_tx_bit_format_put(struct snd_kcontrol *kcontrol,
		struct snd_ctl_elem_value *ucontrol)
		{
		int rc = 0;

		switch (ucontrol->value.integer.value[0]) {
		case 2:
		slim2_tx_bit_format = SNDRV_PCM_FORMAT_S24_3LE;
		break;
		case 1:
		slim2_tx_bit_format = SNDRV_PCM_FORMAT_S24_LE;
		break;
		case 0:
		slim2_tx_bit_format = SNDRV_PCM_FORMAT_S16_LE;
		break;
		default:
		pr_err("%s: invalid value %ld\n", __func__,
		ucontrol->value.integer.value[0]);
		rc = -EINVAL;
		break;
		}
		return rc;
		}

		static int msm_slim_5_rx_ch_get(struct snd_kcontrol *kcontrol,
		struct snd_ctl_elem_value *ucontrol)
		{
		@@ -1005,6 +1052,24 @@ static int msm_slim_0_tx_ch_put(struct snd_kcontrol *kcontrol,
		return 1;
		}

		static int msm_slim_2_tx_ch_get(struct snd_kcontrol *kcontrol,
		struct snd_ctl_elem_value *ucontrol)
		{
		pr_debug("%s: msm_slim_2_tx_ch = %d\n", __func__,
		msm_slim_2_tx_ch);
		ucontrol->value.integer.value[0] = msm_slim_2_tx_ch - 1;
		return 0;
		}

		static int msm_slim_2_tx_ch_put(struct snd_kcontrol *kcontrol,
		struct snd_ctl_elem_value *ucontrol)
		{
		msm_slim_2_tx_ch = ucontrol->value.integer.value[0] + 1;

		pr_debug("%s: msm_slim_2_tx_ch = %d\n", __func__, msm_slim_2_tx_ch);
		return 1;
		}

		static int slim0_tx_sample_rate_get(struct snd_kcontrol *kcontrol,
		struct snd_ctl_elem_value *ucontrol)
		{
		@@ -1532,9 +1597,15 @@ static const char *const spk_function[] = {"Off", "On"};
		static const char *const slim0_rx_ch_text[] = {"One", "Two", "Three", "Four",
		"Five", "Six", "Seven",
		"Eight"};
		static const char *const slim4_rx_ch_text[] = {"One", "Two", "Three", "Four",
		"Five", "Six", "Seven",
		"Eight"};
		static const char *const slim0_tx_ch_text[] = {"One", "Two", "Three", "Four",
		"Five", "Six", "Seven",
		"Eight"};
		static const char *const slim2_tx_ch_text[] = {"One", "Two", "Three", "Four",
		"Five", "Six", "Seven",
		"Eight"};
		static const char *const vi_feed_ch_text[] = {"One", "Two"};
		static char const *rx_bit_format_text[] = {"S16_LE", "S24_LE", "S24_3LE"};
		static char const *slim0_rx_sample_rate_text[] = {"KHZ_48", "KHZ_96",
		@@ -1579,6 +1650,8 @@ static const struct soc_enum msm_snd_enum[] = {
		tdm_bit_format_text),
		SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(tdm_sample_rate_text),
		tdm_sample_rate_text),
		SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(slim4_rx_ch_text), slim4_rx_ch_text),
		SOC_ENUM_SINGLE_EXT(8, slim2_tx_ch_text),
		};

		static const char *const btsco_rate_text[] = {"BTSCO_RATE_8KHZ",
		@@ -1606,6 +1679,8 @@ static const struct snd_kcontrol_new msm_snd_controls[] = {
		msm_slim_0_tx_ch_get, msm_slim_0_tx_ch_put),
		SOC_ENUM_EXT("SLIM_1_TX Channels", msm_snd_enum[2],
		msm_slim_1_tx_ch_get, msm_slim_1_tx_ch_put),
		SOC_ENUM_EXT("SLIM_2_TX Channels", msm_snd_enum[17],
		msm_slim_2_tx_ch_get, msm_slim_2_tx_ch_put),
		SOC_ENUM_EXT("MI2S_RX Format", msm_snd_enum[3],
		mi2s_rx_bit_format_get, mi2s_rx_bit_format_put),
		SOC_ENUM_EXT("SLIM_0_RX Format", msm_snd_enum[3],
		@@ -1626,6 +1701,8 @@ static const struct snd_kcontrol_new msm_snd_controls[] = {
		slim0_tx_sample_rate_get, slim0_tx_sample_rate_put),
		SOC_ENUM_EXT("SLIM_0_TX Format", msm_snd_enum[3],
		slim0_tx_bit_format_get, slim0_tx_bit_format_put),
		SOC_ENUM_EXT("SLIM_2_TX Format", msm_snd_enum[3],
		slim2_tx_bit_format_get, slim2_tx_bit_format_put),
		SOC_ENUM_EXT("Internal BTSCO SampleRate", msm_btsco_enum[0],
		msm_btsco_rate_get, msm_btsco_rate_put),
		SOC_ENUM_EXT("AUXPCM SampleRate", msm_auxpcm_enum[0],
		@@ -2044,6 +2121,8 @@ int msm_snd_hw_params(struct snd_pcm_substream *substream,
		/* For <codec>_tx2 case */
		else if (dai_link->be_id == MSM_BACKEND_DAI_SLIMBUS_1_TX)
		user_set_tx_ch = msm_slim_1_tx_ch;
		else if (dai_link->be_id == MSM_BACKEND_DAI_SLIMBUS_2_TX)
		user_set_tx_ch = msm_slim_2_tx_ch;
		else if (dai_link->be_id == MSM_BACKEND_DAI_SLIMBUS_3_TX)
		/* DAI 5 is used for external EC reference from codec.
		* Since Rx is fed as reference for EC, the config of
		@@ -2182,6 +2261,24 @@ int msm_slim_1_tx_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
		return 0;
		}

		int msm_slim_2_tx_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
		struct snd_pcm_hw_params *params)
		{
		struct snd_interval *rate = hw_param_interval(params,
		SNDRV_PCM_HW_PARAM_RATE);

		struct snd_interval *channels = hw_param_interval(params,
		SNDRV_PCM_HW_PARAM_CHANNELS);

		pr_debug("%s()\n", __func__);
		param_set_mask(params, SNDRV_PCM_HW_PARAM_FORMAT,
		slim2_tx_bit_format);
		rate->min = rate->max = SAMPLING_RATE_48KHZ;
		channels->min = channels->max = msm_slim_2_tx_ch;

		return 0;
		}

		int msm_slim_4_tx_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
		struct snd_pcm_hw_params *params)
		{

sound/soc/msm/msm8952-slimbus.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,8 @@ int msm_slim_0_tx_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
		struct snd_pcm_hw_params *params);
		int msm_slim_1_tx_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
		struct snd_pcm_hw_params *params);
		int msm_slim_2_tx_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
		struct snd_pcm_hw_params *params);
		int msm_slim_4_tx_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
		struct snd_pcm_hw_params *params);
		int msm_slim_5_rx_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,

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

+49 −0

Original line number	Diff line number	Diff line
		@@ -439,6 +439,7 @@ struct msm_pcm_routing_bdai_data msm_bedais[MSM_BACKEND_DAI_MAX] = {
		{ AFE_PORT_ID_QUATERNARY_TDM_TX_7, 0, 0, 0, 0, 0, 0, {0},
		LPASS_BE_QUAT_TDM_TX_7},
		{ INT_BT_A2DP_RX, 0, 0, 0, 0, 0, 0, {0}, LPASS_BE_INT_BT_A2DP_RX},
		{ SLIMBUS_2_TX, 0, 0, 0, 0, 0, 0, {0}, LPASS_BE_SLIMBUS_2_TX},
		};

		/* Track ASM playback & capture sessions of DAI
		@@ -4614,6 +4615,9 @@ static const struct snd_kcontrol_new mmul1_mixer_controls[] = {
		SOC_SINGLE_EXT("SLIM_0_TX", MSM_BACKEND_DAI_SLIMBUS_0_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA1, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("SLIM_2_TX", MSM_BACKEND_DAI_SLIMBUS_2_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA1, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("AUX_PCM_UL_TX", MSM_BACKEND_DAI_AUXPCM_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA1, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		@@ -4716,6 +4720,9 @@ static const struct snd_kcontrol_new mmul2_mixer_controls[] = {
		SOC_SINGLE_EXT("SLIM_0_TX", MSM_BACKEND_DAI_SLIMBUS_0_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA2, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("SLIM_2_TX", MSM_BACKEND_DAI_SLIMBUS_2_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA2, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("QUIN_MI2S_TX", MSM_BACKEND_DAI_QUINARY_MI2S_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA2, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		@@ -4773,6 +4780,9 @@ static const struct snd_kcontrol_new mmul3_mixer_controls[] = {
		SOC_SINGLE_EXT("SLIM_0_TX", MSM_BACKEND_DAI_SLIMBUS_0_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA3, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("SLIM_2_TX", MSM_BACKEND_DAI_SLIMBUS_2_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA3, 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_MULTIMEDIA3, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		@@ -4851,6 +4861,9 @@ static const struct snd_kcontrol_new mmul4_mixer_controls[] = {
		SOC_SINGLE_EXT("SLIM_0_TX", MSM_BACKEND_DAI_SLIMBUS_0_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA4, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("SLIM_2_TX", MSM_BACKEND_DAI_SLIMBUS_2_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA4, 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_MULTIMEDIA4, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		@@ -4932,6 +4945,9 @@ static const struct snd_kcontrol_new mmul5_mixer_controls[] = {
		SOC_SINGLE_EXT("SLIM_0_TX", MSM_BACKEND_DAI_SLIMBUS_0_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA5, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("SLIM_2_TX", MSM_BACKEND_DAI_SLIMBUS_2_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA5, 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_MULTIMEDIA5, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		@@ -5019,6 +5035,9 @@ static const struct snd_kcontrol_new mmul6_mixer_controls[] = {
		SOC_SINGLE_EXT("SLIM_0_TX", MSM_BACKEND_DAI_SLIMBUS_0_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA6, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("SLIM_2_TX", MSM_BACKEND_DAI_SLIMBUS_2_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA6, 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_MULTIMEDIA6, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		@@ -5091,6 +5110,9 @@ static const struct snd_kcontrol_new mmul8_mixer_controls[] = {
		SOC_SINGLE_EXT("SLIM_0_TX", MSM_BACKEND_DAI_SLIMBUS_0_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA8, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("SLIM_2_TX", MSM_BACKEND_DAI_SLIMBUS_2_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA8, 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_MULTIMEDIA8, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		@@ -5175,6 +5197,9 @@ 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,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("SLIM_2_TX", MSM_BACKEND_DAI_SLIMBUS_2_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA9, 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_MULTIMEDIA9, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		@@ -5253,6 +5278,9 @@ static const struct snd_kcontrol_new mmul17_mixer_controls[] = {
		SOC_SINGLE_EXT("SLIM_0_TX", MSM_BACKEND_DAI_SLIMBUS_0_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA17, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("SLIM_2_TX", MSM_BACKEND_DAI_SLIMBUS_2_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA17, 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_MULTIMEDIA17, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		@@ -5280,6 +5308,9 @@ static const struct snd_kcontrol_new mmul18_mixer_controls[] = {
		SOC_SINGLE_EXT("SLIM_0_TX", MSM_BACKEND_DAI_SLIMBUS_0_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA18, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("SLIM_2_TX", MSM_BACKEND_DAI_SLIMBUS_2_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA18, 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_MULTIMEDIA18, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		@@ -5307,6 +5338,9 @@ static const struct snd_kcontrol_new mmul19_mixer_controls[] = {
		SOC_SINGLE_EXT("SLIM_0_TX", MSM_BACKEND_DAI_SLIMBUS_0_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA19, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("SLIM_2_TX", MSM_BACKEND_DAI_SLIMBUS_2_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA19, 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_MULTIMEDIA19, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		@@ -6259,6 +6293,9 @@ static const struct snd_kcontrol_new sbus_0_rx_port_mixer_controls[] = {
		SOC_SINGLE_EXT("SLIM_1_TX", MSM_BACKEND_DAI_SLIMBUS_0_RX,
		MSM_BACKEND_DAI_SLIMBUS_1_TX, 1, 0, msm_routing_get_port_mixer,
		msm_routing_put_port_mixer),
		SOC_SINGLE_EXT("SLIM_2_TX", MSM_BACKEND_DAI_SLIMBUS_0_RX,
		MSM_BACKEND_DAI_SLIMBUS_2_TX, 1, 0, msm_routing_get_port_mixer,
		msm_routing_put_port_mixer),
		SOC_SINGLE_EXT("AUX_PCM_UL_TX", MSM_BACKEND_DAI_SLIMBUS_0_RX,
		MSM_BACKEND_DAI_AUXPCM_TX, 1, 0, msm_routing_get_port_mixer,
		msm_routing_put_port_mixer),
		@@ -9069,6 +9106,7 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = {
		SND_SOC_DAPM_AIF_IN("SEC_MI2S_TX", "Secondary MI2S Capture",
		0, 0, 0, 0),
		SND_SOC_DAPM_AIF_IN("SLIMBUS_0_TX", "Slimbus Capture", 0, 0, 0, 0),
		SND_SOC_DAPM_AIF_IN("SLIMBUS_2_TX", "Slimbus2 Capture", 0, 0, 0, 0),
		SND_SOC_DAPM_AIF_IN("QUIN_MI2S_TX", "Quinary MI2S Capture",
		0, 0, 0, 0),
		SND_SOC_DAPM_AIF_OUT("INT_BT_SCO_RX", "Internal BT-SCO Playback",
		@@ -9825,6 +9863,11 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"MultiMedia18 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},
		{"MultiMedia19 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},
		{"MultiMedia8 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},
		{"MultiMedia4 Mixer", "SLIM_2_TX", "SLIMBUS_2_TX"},
		{"MultiMedia17 Mixer", "SLIM_2_TX", "SLIMBUS_2_TX"},
		{"MultiMedia18 Mixer", "SLIM_2_TX", "SLIMBUS_2_TX"},
		{"MultiMedia19 Mixer", "SLIM_2_TX", "SLIMBUS_2_TX"},
		{"MultiMedia8 Mixer", "SLIM_2_TX", "SLIMBUS_2_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"},
		@@ -9833,6 +9876,8 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"MultiMedia8 Mixer", "PRI_MI2S_TX", "PRI_MI2S_TX"},
		{"MultiMedia3 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},
		{"MultiMedia5 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},
		{"MultiMedia3 Mixer", "SLIM_2_TX", "SLIMBUS_2_TX"},
		{"MultiMedia5 Mixer", "SLIM_2_TX", "SLIMBUS_2_TX"},
		{"MI2S_RX Audio Mixer", "MultiMedia1", "MM_DL1"},
		{"MI2S_RX Audio Mixer", "MultiMedia2", "MM_DL2"},
		{"MI2S_RX Audio Mixer", "MultiMedia3", "MM_DL3"},
		@@ -10260,6 +10305,7 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"MultiMedia1 Mixer", "TERT_MI2S_TX", "TERT_MI2S_TX"},
		{"MultiMedia2 Mixer", "TERT_MI2S_TX", "TERT_MI2S_TX"},
		{"MultiMedia1 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},
		{"MultiMedia1 Mixer", "SLIM_2_TX", "SLIMBUS_2_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"},
		@@ -10267,10 +10313,12 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"MultiMedia3 Mixer", "SEC_AUX_PCM_TX", "SEC_AUX_PCM_TX"},
		{"MultiMedia5 Mixer", "SEC_AUX_PCM_TX", "SEC_AUX_PCM_TX"},
		{"MultiMedia2 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},
		{"MultiMedia2 Mixer", "SLIM_2_TX", "SLIMBUS_2_TX"},
		{"MultiMedia1 Mixer", "SEC_MI2S_TX", "SEC_MI2S_TX"},
		{"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_2_TX", "SLIMBUS_2_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"},
		@@ -11595,6 +11643,7 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"SENARY_MI2S_TX", NULL, "BE_IN" },
		{"SLIMBUS_0_TX", NULL, "BE_IN" },
		{"SLIMBUS_1_TX", NULL, "BE_IN" },
		{"SLIMBUS_2_TX", NULL, "BE_IN" },
		{"SLIMBUS_3_TX", NULL, "BE_IN" },
		{"SLIMBUS_4_TX", NULL, "BE_IN" },
		{"SLIMBUS_5_TX", NULL, "BE_IN" },

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		#define LPASS_BE_PRI_I2S_TX "PRIMARY_I2S_TX"
		#define LPASS_BE_SLIMBUS_0_RX "SLIMBUS_0_RX"
		#define LPASS_BE_SLIMBUS_0_TX "SLIMBUS_0_TX"
		#define LPASS_BE_SLIMBUS_2_TX "SLIMBUS_2_TX"
		#define LPASS_BE_HDMI "HDMI"
		#define LPASS_BE_INT_BT_SCO_RX "INT_BT_SCO_RX"
		#define LPASS_BE_INT_BT_SCO_TX "INT_BT_SCO_TX"
		@@ -299,6 +300,7 @@ enum {
		MSM_BACKEND_DAI_QUAT_TDM_RX_7,
		MSM_BACKEND_DAI_QUAT_TDM_TX_7,
		MSM_BACKEND_DAI_INT_BT_A2DP_RX,
		MSM_BACKEND_DAI_SLIMBUS_2_TX,
		MSM_BACKEND_DAI_MAX,
		};