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

Commit 265d94d2 authored by Sachin Mohan Gadag's avatar Sachin Mohan Gadag
Browse files

asoc: Add new dais to support compress record 



Add new dais to support compress record usecase.
Update media_encoder_format api to v4 version in
compress driver.

CRs-Fixed: 2167556
Change-Id: I8a2f8a4cdcec4bb31ad94730eb4f1259e800c70c
Signed-off-by: default avatarSachin Mohan Gadag <sgadag@codeaurora.org>
parent 05cae991

asoc/msm-compress-q6-v2.c

+4 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2018, 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
@@ -1521,9 +1521,10 @@ static int msm_compr_configure_dsp_for_capture(struct snd_compr_stream *cstream) 
	pr_debug("%s: sample_rate = %d channels = %d bps = %d sample_word_size = %d\n",

			__func__, prtd->sample_rate, prtd->num_channels,

					 bits_per_sample, sample_word_size);

	ret = q6asm_enc_cfg_blk_pcm_format_support_v3(prtd->audio_client,

	ret = q6asm_enc_cfg_blk_pcm_format_support_v4(prtd->audio_client,

					prtd->sample_rate, prtd->num_channels,

					bits_per_sample, sample_word_size);

					bits_per_sample, sample_word_size,

					ASM_LITTLE_ENDIAN, DEFAULT_QF);



	return ret;

}

asoc/msm-dai-fe.c

+44 −6
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2018, 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
@@ -2453,7 +2453,7 @@ static struct snd_soc_dai_driver msm_fe_dais[] = { 
		.capture = {

			.stream_name = "MultiMedia17 Capture",

			.aif_name = "MM_UL17",

			.rates = (SNDRV_PCM_RATE_8000_48000|

			.rates = (SNDRV_PCM_RATE_8000_192000|

					SNDRV_PCM_RATE_KNOT),

			.formats = (SNDRV_PCM_FMTBIT_S16_LE |

				    SNDRV_PCM_FMTBIT_S24_LE |
@@ -2461,7 +2461,7 @@ static struct snd_soc_dai_driver msm_fe_dais[] = { 
			.channels_min = 1,

			.channels_max = 8,

			.rate_min =     8000,

			.rate_max =     48000,

			.rate_max =     192000,

		},

		.ops = &msm_fe_Multimedia_dai_ops,

		.compress_new = snd_soc_new_compress,
@@ -2472,7 +2472,7 @@ static struct snd_soc_dai_driver msm_fe_dais[] = { 
		.capture = {

			.stream_name = "MultiMedia18 Capture",

			.aif_name = "MM_UL18",

			.rates = (SNDRV_PCM_RATE_8000_48000|

			.rates = (SNDRV_PCM_RATE_8000_192000|

					SNDRV_PCM_RATE_KNOT),

			.formats = (SNDRV_PCM_FMTBIT_S16_LE |

				    SNDRV_PCM_FMTBIT_S24_LE |
@@ -2491,7 +2491,7 @@ static struct snd_soc_dai_driver msm_fe_dais[] = { 
		.capture = {

			.stream_name = "MultiMedia19 Capture",

			.aif_name = "MM_UL19",

			.rates = (SNDRV_PCM_RATE_8000_48000|

			.rates = (SNDRV_PCM_RATE_8000_192000|

					SNDRV_PCM_RATE_KNOT),

			.formats = (SNDRV_PCM_FMTBIT_S16_LE |

				    SNDRV_PCM_FMTBIT_S24_LE |
@@ -2499,7 +2499,7 @@ static struct snd_soc_dai_driver msm_fe_dais[] = { 
			.channels_min = 1,

			.channels_max = 8,

			.rate_min =     8000,

			.rate_max =     48000,

			.rate_max =     192000,

		},

		.ops = &msm_fe_Multimedia_dai_ops,

		.compress_new = snd_soc_new_compress,
@@ -2539,6 +2539,44 @@ static struct snd_soc_dai_driver msm_fe_dais[] = { 
		.name = "MultiMedia20",

		.probe = fe_dai_probe,

	},

	{

		.capture = {

		.stream_name = "MultiMedia28 Capture",

		.aif_name = "MM_UL28",

		.rates = (SNDRV_PCM_RATE_8000_192000|

			  SNDRV_PCM_RATE_KNOT),

		.formats = (SNDRV_PCM_FMTBIT_S16_LE |

			    SNDRV_PCM_FMTBIT_S24_LE |

			    SNDRV_PCM_FMTBIT_S24_3LE),

		.channels_min = 1,

		.channels_max = 8,

		.rate_min =     8000,

		.rate_max =     192000,

		},

		.ops = &msm_fe_Multimedia_dai_ops,

		.compress_new = snd_soc_new_compress,

		.name = "MultiMedia28",

		.probe = fe_dai_probe,

	},

	{

		.capture = {

			.stream_name = "MultiMedia29 Capture",

			.aif_name = "MM_UL29",

			.rates = (SNDRV_PCM_RATE_8000_192000|

				  SNDRV_PCM_RATE_KNOT),

			.formats = (SNDRV_PCM_FMTBIT_S16_LE |

				    SNDRV_PCM_FMTBIT_S24_LE |

				    SNDRV_PCM_FMTBIT_S24_3LE),

			.channels_min = 1,

			.channels_max = 8,

			.rate_min =     8000,

			.rate_max =     192000,

		},

		.ops = &msm_fe_Multimedia_dai_ops,

		.compress_new = snd_soc_new_compress,

		.name = "MultiMedia29",

		.probe = fe_dai_probe,

	},

};



static int msm_fe_dai_dev_probe(struct platform_device *pdev)

asoc/msm-pcm-routing-v2.c

+225 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2018, 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
@@ -643,6 +643,12 @@ static struct msm_pcm_routing_fdai_data 
	{{0, INVALID_SESSION, LEGACY_PCM_MODE, {NULL, NULL} },

	 {0, INVALID_SESSION, LEGACY_PCM_MODE, {NULL, NULL} } },

	/* MULTIMEDIA20 */

	{{0, INVALID_SESSION, LEGACY_PCM_MODE, {NULL, NULL} },

	 {0, INVALID_SESSION, LEGACY_PCM_MODE, {NULL, NULL} } },

	/* MULTIMEDIA28 */

	{{0, INVALID_SESSION, LEGACY_PCM_MODE, {NULL, NULL} },

	 {0, INVALID_SESSION, LEGACY_PCM_MODE, {NULL, NULL} } },

	/* MULTIMEDIA29 */

	{{0, INVALID_SESSION, LEGACY_PCM_MODE, {NULL, NULL} },

	 {0, INVALID_SESSION, LEGACY_PCM_MODE, {NULL, NULL} } },

	/* VOIP */
@@ -3728,6 +3734,16 @@ static const struct snd_kcontrol_new ext_ec_ref_mux_ul19 = 
		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_ul28 =









	SOC_DAPM_ENUM_EXT("AUDIO_REF_EC_UL28 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_ul29 =









	SOC_DAPM_ENUM_EXT("AUDIO_REF_EC_UL29 MUX Mux",









		msm_route_ec_ref_rx_enum[0],









		msm_routing_ec_ref_rx_get, msm_routing_ec_ref_rx_put);

















static int msm_routing_ext_ec_get(struct snd_kcontrol *kcontrol,









				  struct snd_ctl_elem_value *ucontrol)









{








@@ -3871,6 +3887,12 @@ static const struct snd_kcontrol_new pri_i2s_rx_mixer_controls[] = {







	SOC_SINGLE_EXT("MultiMedia19", MSM_BACKEND_DAI_PRI_I2S_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA19, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









	SOC_SINGLE_EXT("MultiMedia28", MSM_BACKEND_DAI_PRI_I2S_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA28, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









	SOC_SINGLE_EXT("MultiMedia29", MSM_BACKEND_DAI_PRI_I2S_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA29, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









};

















static const struct snd_kcontrol_new sec_i2s_rx_mixer_controls[] = {








@@ -3931,6 +3953,12 @@ static const struct snd_kcontrol_new sec_i2s_rx_mixer_controls[] = {







	SOC_SINGLE_EXT("MultiMedia19", MSM_BACKEND_DAI_SEC_I2S_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA19, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









	SOC_SINGLE_EXT("MultiMedia28", MSM_BACKEND_DAI_SEC_I2S_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA28, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









	SOC_SINGLE_EXT("MultiMedia29", MSM_BACKEND_DAI_SEC_I2S_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA29, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









};

















static const struct snd_kcontrol_new spdif_rx_mixer_controls[] = {








@@ -3991,7 +4019,12 @@ static const struct snd_kcontrol_new spdif_rx_mixer_controls[] = {







	SOC_SINGLE_EXT("MultiMedia19", MSM_BACKEND_DAI_SPDIF_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA19, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),

















	SOC_SINGLE_EXT("MultiMedia28", MSM_BACKEND_DAI_SPDIF_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA28, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









	SOC_SINGLE_EXT("MultiMedia29", MSM_BACKEND_DAI_SPDIF_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA29, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









};

















static const struct snd_kcontrol_new slimbus_2_rx_mixer_controls[] = {








@@ -4103,6 +4136,12 @@ static const struct snd_kcontrol_new slimbus_5_rx_mixer_controls[] = {







	SOC_SINGLE_EXT("MultiMedia19", MSM_BACKEND_DAI_SLIMBUS_5_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA19, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









	SOC_SINGLE_EXT("MultiMedia28", MSM_BACKEND_DAI_SLIMBUS_5_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA28, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









	SOC_SINGLE_EXT("MultiMedia29", MSM_BACKEND_DAI_SLIMBUS_5_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA29, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









};

















static const struct snd_kcontrol_new slimbus_rx_mixer_controls[] = {








@@ -4163,6 +4202,12 @@ static const struct snd_kcontrol_new slimbus_rx_mixer_controls[] = {







	SOC_SINGLE_EXT("MultiMedia19", MSM_BACKEND_DAI_SLIMBUS_0_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA19, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









	SOC_SINGLE_EXT("MultiMedia28", MSM_BACKEND_DAI_SLIMBUS_0_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA28, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









	SOC_SINGLE_EXT("MultiMedia29", MSM_BACKEND_DAI_SLIMBUS_0_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA29, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









};

















static const struct snd_kcontrol_new mi2s_rx_mixer_controls[] = {








@@ -4223,6 +4268,12 @@ static const struct snd_kcontrol_new mi2s_rx_mixer_controls[] = {







	SOC_SINGLE_EXT("MultiMedia19", MSM_BACKEND_DAI_MI2S_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA19, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









	SOC_SINGLE_EXT("MultiMedia28", MSM_BACKEND_DAI_MI2S_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA28, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









	SOC_SINGLE_EXT("MultiMedia29", MSM_BACKEND_DAI_MI2S_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA29, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









};

















static const struct snd_kcontrol_new quaternary_mi2s_rx_mixer_controls[] = {








@@ -4283,6 +4334,12 @@ static const struct snd_kcontrol_new quaternary_mi2s_rx_mixer_controls[] = {







	SOC_SINGLE_EXT("MultiMedia19", MSM_BACKEND_DAI_QUATERNARY_MI2S_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA19, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









	SOC_SINGLE_EXT("MultiMedia28", MSM_BACKEND_DAI_QUATERNARY_MI2S_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA28, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









	SOC_SINGLE_EXT("MultiMedia29", MSM_BACKEND_DAI_QUATERNARY_MI2S_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA29, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









};

















static const struct snd_kcontrol_new quinary_mi2s_rx_mixer_controls[] = {








@@ -4343,6 +4400,13 @@ static const struct snd_kcontrol_new quinary_mi2s_rx_mixer_controls[] = {







	SOC_SINGLE_EXT("MultiMedia19", MSM_BACKEND_DAI_QUINARY_MI2S_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA19, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









	SOC_SINGLE_EXT("MultiMedia28", MSM_BACKEND_DAI_QUINARY_MI2S_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA28, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









	SOC_SINGLE_EXT("MultiMedia29", MSM_BACKEND_DAI_QUINARY_MI2S_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA29, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),

















};

















static const struct snd_kcontrol_new tertiary_mi2s_rx_mixer_controls[] = {








@@ -4397,6 +4461,12 @@ static const struct snd_kcontrol_new tertiary_mi2s_rx_mixer_controls[] = {







	SOC_SINGLE_EXT("MultiMedia19", MSM_BACKEND_DAI_TERTIARY_MI2S_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA19, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









	SOC_SINGLE_EXT("MultiMedia28", MSM_BACKEND_DAI_TERTIARY_MI2S_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA28, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









	SOC_SINGLE_EXT("MultiMedia29", MSM_BACKEND_DAI_TERTIARY_MI2S_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA29, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









};

















static const struct snd_kcontrol_new secondary_mi2s_rx2_mixer_controls[] = {








@@ -4463,6 +4533,12 @@ static const struct snd_kcontrol_new secondary_mi2s_rx_mixer_controls[] = {







	SOC_SINGLE_EXT("MultiMedia19", MSM_BACKEND_DAI_SECONDARY_MI2S_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA19, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









	SOC_SINGLE_EXT("MultiMedia28", MSM_BACKEND_DAI_SECONDARY_MI2S_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA28, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









	SOC_SINGLE_EXT("MultiMedia29", MSM_BACKEND_DAI_SECONDARY_MI2S_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA29, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









};

















static const struct snd_kcontrol_new primary_mi2s_rx_mixer_controls[] = {








@@ -4523,6 +4599,13 @@ static const struct snd_kcontrol_new primary_mi2s_rx_mixer_controls[] = {







	SOC_SINGLE_EXT("MultiMedia19", MSM_BACKEND_DAI_PRI_MI2S_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA19, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









	SOC_SINGLE_EXT("MultiMedia28", MSM_BACKEND_DAI_PRI_MI2S_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA28, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









	SOC_SINGLE_EXT("MultiMedia29", MSM_BACKEND_DAI_PRI_MI2S_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA29, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),

















};

















static const struct snd_kcontrol_new int0_mi2s_rx_mixer_controls[] = {








@@ -4685,6 +4768,12 @@ static const struct snd_kcontrol_new hdmi_mixer_controls[] = {







	SOC_SINGLE_EXT("MultiMedia19", MSM_BACKEND_DAI_HDMI_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA19, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









	SOC_SINGLE_EXT("MultiMedia28", MSM_BACKEND_DAI_HDMI_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA28, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









	SOC_SINGLE_EXT("MultiMedia29", MSM_BACKEND_DAI_HDMI_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA29, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









};

















static const struct snd_kcontrol_new display_port_mixer_controls[] = {








@@ -4995,6 +5084,12 @@ static const struct snd_kcontrol_new int_bt_sco_rx_mixer_controls[] = {







	SOC_SINGLE_EXT("MultiMedia19", MSM_BACKEND_DAI_INT_BT_SCO_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA19, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









	SOC_SINGLE_EXT("MultiMedia28", MSM_BACKEND_DAI_INT_BT_SCO_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA28, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









	SOC_SINGLE_EXT("MultiMedia29", MSM_BACKEND_DAI_INT_BT_SCO_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA29, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









};

















static const struct snd_kcontrol_new int_bt_a2dp_rx_mixer_controls[] = {








@@ -5106,6 +5201,12 @@ static const struct snd_kcontrol_new int_fm_rx_mixer_controls[] = {







	SOC_SINGLE_EXT("MultiMedia19", MSM_BACKEND_DAI_INT_FM_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA19, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









	SOC_SINGLE_EXT("MultiMedia28", MSM_BACKEND_DAI_INT_FM_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA28, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









	SOC_SINGLE_EXT("MultiMedia29", MSM_BACKEND_DAI_INT_FM_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA29, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









};

















static const struct snd_kcontrol_new afe_pcm_rx_mixer_controls[] = {








@@ -5166,6 +5267,12 @@ static const struct snd_kcontrol_new afe_pcm_rx_mixer_controls[] = {







	SOC_SINGLE_EXT("MultiMedia19", MSM_BACKEND_DAI_AFE_PCM_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA19, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









	SOC_SINGLE_EXT("MultiMedia28", MSM_BACKEND_DAI_AFE_PCM_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA28, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









	SOC_SINGLE_EXT("MultiMedia29", MSM_BACKEND_DAI_AFE_PCM_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA29, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









};

















static const struct snd_kcontrol_new auxpcm_rx_mixer_controls[] = {








@@ -5226,6 +5333,12 @@ static const struct snd_kcontrol_new auxpcm_rx_mixer_controls[] = {







	SOC_SINGLE_EXT("MultiMedia19", MSM_BACKEND_DAI_AUXPCM_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA19, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









	SOC_SINGLE_EXT("MultiMedia28", MSM_BACKEND_DAI_AUXPCM_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA28, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









	SOC_SINGLE_EXT("MultiMedia29", MSM_BACKEND_DAI_AUXPCM_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA29, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









};

















static const struct snd_kcontrol_new sec_auxpcm_rx_mixer_controls[] = {








@@ -5286,6 +5399,12 @@ static const struct snd_kcontrol_new sec_auxpcm_rx_mixer_controls[] = {







	SOC_SINGLE_EXT("MultiMedia19", MSM_BACKEND_DAI_SEC_AUXPCM_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA19, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









	SOC_SINGLE_EXT("MultiMedia28", MSM_BACKEND_DAI_SEC_AUXPCM_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA28, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









	SOC_SINGLE_EXT("MultiMedia29", MSM_BACKEND_DAI_SEC_AUXPCM_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA29, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









};

















static const struct snd_kcontrol_new tert_auxpcm_rx_mixer_controls[] = {








@@ -7831,6 +7950,9 @@ static const struct snd_kcontrol_new mmul17_mixer_controls[] = {







	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),









	SOC_SINGLE_EXT("INT3_MI2S_TX", MSM_BACKEND_DAI_INT3_MI2S_TX,









	MSM_FRONTEND_DAI_MULTIMEDIA17, 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_MULTIMEDIA17, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),








@@ -7855,6 +7977,9 @@ static const struct snd_kcontrol_new mmul18_mixer_controls[] = {







	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),









	SOC_SINGLE_EXT("INT3_MI2S_TX", MSM_BACKEND_DAI_INT3_MI2S_TX,









	MSM_FRONTEND_DAI_MULTIMEDIA18, 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_MULTIMEDIA18, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),








@@ -7882,6 +8007,9 @@ static const struct snd_kcontrol_new mmul19_mixer_controls[] = {







	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),









	SOC_SINGLE_EXT("INT3_MI2S_TX", MSM_BACKEND_DAI_INT3_MI2S_TX,









	MSM_FRONTEND_DAI_MULTIMEDIA19, 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_MULTIMEDIA19, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),








@@ -7977,6 +8105,60 @@ static const struct snd_kcontrol_new mmul20_mixer_controls[] = {







	msm_routing_put_audio_mixer),









};

















static const struct snd_kcontrol_new mmul28_mixer_controls[] = {









	SOC_SINGLE_EXT("SLIM_0_TX", MSM_BACKEND_DAI_SLIMBUS_0_TX,









	MSM_FRONTEND_DAI_MULTIMEDIA28, 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_MULTIMEDIA28, 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_MULTIMEDIA28, 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_MULTIMEDIA28, 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_MULTIMEDIA28, 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_MULTIMEDIA28, 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_MULTIMEDIA28, 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_MULTIMEDIA28, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









};

















static const struct snd_kcontrol_new mmul29_mixer_controls[] = {









	SOC_SINGLE_EXT("SLIM_0_TX", MSM_BACKEND_DAI_SLIMBUS_0_TX,









	MSM_FRONTEND_DAI_MULTIMEDIA29, 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_MULTIMEDIA29, 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_MULTIMEDIA29, 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_MULTIMEDIA29, 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_MULTIMEDIA29, 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_MULTIMEDIA29, 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_MULTIMEDIA29, 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_MULTIMEDIA29, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









};

















static const struct snd_kcontrol_new pri_rx_voice_mixer_controls[] = {









	SOC_SINGLE_EXT("Voip", MSM_BACKEND_DAI_PRI_I2S_RX,









	MSM_FRONTEND_DAI_VOIP, 1, 0, msm_routing_get_voice_mixer,








@@ -13172,6 +13354,10 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = {







	mmul19_mixer_controls, ARRAY_SIZE(mmul19_mixer_controls)),









	SND_SOC_DAPM_MIXER("MultiMedia20 Mixer", SND_SOC_NOPM, 0, 0,









	mmul20_mixer_controls, ARRAY_SIZE(mmul20_mixer_controls)),









	SND_SOC_DAPM_MIXER("MultiMedia28 Mixer", SND_SOC_NOPM, 0, 0,









	mmul28_mixer_controls, ARRAY_SIZE(mmul28_mixer_controls)),









	SND_SOC_DAPM_MIXER("MultiMedia29 Mixer", SND_SOC_NOPM, 0, 0,









	mmul29_mixer_controls, ARRAY_SIZE(mmul29_mixer_controls)),









	SND_SOC_DAPM_MIXER("AUX_PCM_RX Audio Mixer", SND_SOC_NOPM, 0, 0,









	auxpcm_rx_mixer_controls, ARRAY_SIZE(auxpcm_rx_mixer_controls)),









	SND_SOC_DAPM_MIXER("SEC_AUX_PCM_RX Audio Mixer", SND_SOC_NOPM, 0, 0,








@@ -13754,14 +13940,27 @@ static const struct snd_soc_dapm_route intercon[] = {







	{"MultiMedia17 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},









	{"MultiMedia18 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},









	{"MultiMedia19 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},









	{"MultiMedia28 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},









	{"MultiMedia29 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},









	{"MultiMedia8 Mixer", "SLIM_0_TX", "SLIMBUS_0_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"},









	{"MultiMedia18 Mixer", "PRI_MI2S_TX", "PRI_MI2S_TX"},









	{"MultiMedia19 Mixer", "PRI_MI2S_TX", "PRI_MI2S_TX"},









	{"MultiMedia28 Mixer", "PRI_MI2S_TX", "PRI_MI2S_TX"},









	{"MultiMedia29 Mixer", "PRI_MI2S_TX", "PRI_MI2S_TX"},









	{"MultiMedia8 Mixer", "PRI_MI2S_TX", "PRI_MI2S_TX"},









	{"MultiMedia17 Mixer", "TERT_MI2S_TX", "TERT_MI2S_TX"},









	{"MultiMedia18 Mixer", "TERT_MI2S_TX", "TERT_MI2S_TX"},









	{"MultiMedia19 Mixer", "TERT_MI2S_TX", "TERT_MI2S_TX"},









	{"MultiMedia28 Mixer", "TERT_MI2S_TX", "TERT_MI2S_TX"},









	{"MultiMedia29 Mixer", "TERT_MI2S_TX", "TERT_MI2S_TX"},









	{"MultiMedia17 Mixer", "QUAT_MI2S_TX", "QUAT_MI2S_TX"},









	{"MultiMedia18 Mixer", "QUAT_MI2S_TX", "QUAT_MI2S_TX"},









	{"MultiMedia19 Mixer", "QUAT_MI2S_TX", "QUAT_MI2S_TX"},









	{"MultiMedia28 Mixer", "QUAT_MI2S_TX", "QUAT_MI2S_TX"},









	{"MultiMedia29 Mixer", "QUAT_MI2S_TX", "QUAT_MI2S_TX"},









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









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









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








@@ -14452,6 +14651,11 @@ static const struct snd_soc_dapm_route intercon[] = {







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









	{"MultiMedia10 Mixer", "INT3_MI2S_TX", "INT3_MI2S_TX"},









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









	{"MultiMedia17 Mixer", "INT3_MI2S_TX", "INT3_MI2S_TX"},









	{"MultiMedia18 Mixer", "INT3_MI2S_TX", "INT3_MI2S_TX"},









	{"MultiMedia19 Mixer", "INT3_MI2S_TX", "INT3_MI2S_TX"},









	{"MultiMedia28 Mixer", "INT3_MI2S_TX", "INT3_MI2S_TX"},









	{"MultiMedia29 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"},








@@ -14759,6 +14963,8 @@ static const struct snd_soc_dapm_route intercon[] = {







	{"MultiMedia17 Mixer", "INTERNAL_BT_SCO_TX", "INT_BT_SCO_TX"},









	{"MultiMedia18 Mixer", "INTERNAL_BT_SCO_TX", "INT_BT_SCO_TX"},









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









	{"MultiMedia28 Mixer", "INTERNAL_BT_SCO_TX", "INT_BT_SCO_TX"},









	{"MultiMedia29 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"},








@@ -14768,6 +14974,8 @@ static const struct snd_soc_dapm_route intercon[] = {







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









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









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









	{"MultiMedia28 Mixer", "INTERNAL_FM_TX", "INT_FM_TX"},









	{"MultiMedia29 Mixer", "INTERNAL_FM_TX", "INT_FM_TX"},









	{"MultiMedia5 Mixer", "INTERNAL_FM_TX", "INT_FM_TX"},









	{"MultiMedia6 Mixer", "INTERNAL_FM_TX", "INT_FM_TX"},









	{"MultiMedia8 Mixer", "INTERNAL_FM_TX", "INT_FM_TX"},








@@ -14779,6 +14987,8 @@ static const struct snd_soc_dapm_route intercon[] = {







	{"MultiMedia17 Mixer", "AFE_PCM_TX", "PCM_TX"},









	{"MultiMedia18 Mixer", "AFE_PCM_TX", "PCM_TX"},









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









	{"MultiMedia28 Mixer", "AFE_PCM_TX", "PCM_TX"},









	{"MultiMedia29 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"},








@@ -14797,6 +15007,8 @@ static const struct snd_soc_dapm_route intercon[] = {







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









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









	{"MM_UL20", NULL, "MultiMedia20 Mixer"},









	{"MM_UL28", NULL, "MultiMedia28 Mixer"},









	{"MM_UL29", NULL, "MultiMedia29 Mixer"},

















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









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








@@ -15129,6 +15341,15 @@ static const struct snd_soc_dapm_route intercon[] = {







	{"AUDIO_REF_EC_UL19 MUX", "TERT_MI2S_TX", "TERT_MI2S_TX"},









	{"AUDIO_REF_EC_UL19 MUX", "QUAT_MI2S_TX", "QUAT_MI2S_TX"},

















	{"AUDIO_REF_EC_UL28 MUX", "PRI_MI2S_TX", "PRI_MI2S_TX"},









	{"AUDIO_REF_EC_UL28 MUX", "SEC_MI2S_TX", "SEC_MI2S_TX"},









	{"AUDIO_REF_EC_UL28 MUX", "TERT_MI2S_TX", "TERT_MI2S_TX"},









	{"AUDIO_REF_EC_UL28 MUX", "QUAT_MI2S_TX", "QUAT_MI2S_TX"},

















	{"AUDIO_REF_EC_UL29 MUX", "PRI_MI2S_TX", "PRI_MI2S_TX"},









	{"AUDIO_REF_EC_UL29 MUX", "SEC_MI2S_TX", "SEC_MI2S_TX"},









	{"AUDIO_REF_EC_UL29 MUX", "TERT_MI2S_TX", "TERT_MI2S_TX"},









	{"AUDIO_REF_EC_UL29 MUX", "QUAT_MI2S_TX", "QUAT_MI2S_TX"},

















	{"LSM1_UL_HL", NULL, "AUDIO_REF_EC_UL1 MUX"},









	{"LSM2_UL_HL", NULL, "AUDIO_REF_EC_UL1 MUX"},








@@ -15152,6 +15373,8 @@ static const struct snd_soc_dapm_route intercon[] = {







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









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









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









	{"MM_UL28", NULL, "AUDIO_REF_EC_UL28 MUX"},









	{"MM_UL29", NULL, "AUDIO_REF_EC_UL29 MUX"},

















	{"VoiceMMode1_Tx Mixer", "PRI_TX_MMode1", "PRI_I2S_TX"},









	{"VoiceMMode1_Tx Mixer", "PRI_MI2S_TX_MMode1", "PRI_MI2S_TX"},

























asoc/msm-pcm-routing-v2.h



+5
−3






























Original line number
Diff line number
Diff line









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









/* Copyright (c) 2012-2018, 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








@@ -211,6 +211,8 @@ enum {







	MSM_FRONTEND_DAI_MULTIMEDIA18,









	MSM_FRONTEND_DAI_MULTIMEDIA19,









	MSM_FRONTEND_DAI_MULTIMEDIA20,









	MSM_FRONTEND_DAI_MULTIMEDIA28,









	MSM_FRONTEND_DAI_MULTIMEDIA29,









	MSM_FRONTEND_DAI_VOIP,









	MSM_FRONTEND_DAI_AFE_RX,









	MSM_FRONTEND_DAI_AFE_TX,








@@ -232,8 +234,8 @@ enum {







	MSM_FRONTEND_DAI_MAX,









};



















#define MSM_FRONTEND_DAI_MM_SIZE (MSM_FRONTEND_DAI_MULTIMEDIA20 + 1)









#define MSM_FRONTEND_DAI_MM_MAX_ID MSM_FRONTEND_DAI_MULTIMEDIA20









#define MSM_FRONTEND_DAI_MM_SIZE (MSM_FRONTEND_DAI_MULTIMEDIA29 + 1)









#define MSM_FRONTEND_DAI_MM_MAX_ID MSM_FRONTEND_DAI_MULTIMEDIA29



















enum {









	MSM_BACKEND_DAI_PRI_I2S_RX = 0,