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

Commit 9fdd00c8 authored by Venkataadiseshu Jidugu's avatar Venkataadiseshu Jidugu
Browse files

asoc: msm-8998: Add new FE's for TDM Primary 



      With Primary TDM group device enabled, new front ends
      are required.
      Added new FE's to support TDM group device capture.

Change-Id: I3340521c626c8c120c725092e8a3241a7cb89dd5
Signed-off-by: default avatarVenkataadiseshu Jidugu <cvjidug@codeaurora.org>
parent 53d42ac3

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

+132 −0
Original line number Diff line number Diff line
@@ -2843,6 +2843,138 @@ static struct snd_soc_dai_driver msm_fe_dais[] = { 
		.name = "MultiMedia29",

		.probe = fe_dai_probe,

	},

	{

		.playback = {

			.stream_name = "MultiMedia30 Playback",

			.aif_name = "MM_DL30",

			.rates = (SNDRV_PCM_RATE_8000_384000|

				  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 = 32,

			.rate_min =     8000,

			.rate_max =     384000,

		},

		.capture = {

			.stream_name = "MultiMedia30 Capture",

			.aif_name = "MM_UL30",

			.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 = 32,

			.rate_min = 8000,

			.rate_max = 384000,

		},

		.ops = &msm_fe_Multimedia_dai_ops,

		.name = "MultiMedia30",

		.probe = fe_dai_probe,

	},

	{

		.playback = {

			.stream_name = "MultiMedia31 Playback",

			.aif_name = "MM_DL31",

			.rates = (SNDRV_PCM_RATE_8000_384000|

				  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 = 32,

			.rate_min =     8000,

			.rate_max =     384000,

		},

		.capture = {

			.stream_name = "MultiMedia31 Capture",

			.aif_name = "MM_UL31",

			.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 = 32,

			.rate_min =     8000,

			.rate_max =     48000,

		},

		.ops = &msm_fe_Multimedia_dai_ops,

		.name = "MultiMedia31",

		.probe = fe_dai_probe,

	},

	{

		.playback = {

			.stream_name = "MultiMedia32 Playback",

			.aif_name = "MM_DL32",

			.rates = (SNDRV_PCM_RATE_8000_384000|

				  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 = 32,

			.rate_min =     8000,

			.rate_max =     384000,

		},

		.capture = {

			.stream_name = "MultiMedia32 Capture",

			.aif_name = "MM_UL32",

			.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 = 32,

			.rate_min =     8000,

			.rate_max =	48000,

		},

		.ops = &msm_fe_Multimedia_dai_ops,

		.name = "MultiMedia32",

		.probe = fe_dai_probe,

	},

	{

		.playback = {

			.stream_name = "MultiMedia33 Playback",

			.aif_name = "MM_DL33",

			.rates = (SNDRV_PCM_RATE_8000_384000|

				  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 = 32,

			.rate_min =     8000,

			.rate_max =	384000,

		},

		.capture = {

			.stream_name = "MultiMedia33 Capture",

			.aif_name = "MM_UL33",

			.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 = 32,

			.rate_min =     8000,

			.rate_max =	48000,

		},

		.ops = &msm_fe_Multimedia_dai_ops,

		.name = "MultiMedia33",

		.probe = fe_dai_probe,

	},

};



static int msm_fe_dai_dev_probe(struct platform_device *pdev)

sound/soc/msm/msm8998.c

+149 −3
Original line number Diff line number Diff line
@@ -3222,18 +3222,45 @@ static const struct snd_kcontrol_new msm_snd_controls[] = { 
	SOC_ENUM_EXT("PRI_TDM_TX_0 SampleRate", tdm_tx_sample_rate,

			tdm_tx_sample_rate_get,

			tdm_tx_sample_rate_put),

	SOC_ENUM_EXT("PRI_TDM_TX_1 SampleRate", tdm_tx_sample_rate,

			tdm_tx_sample_rate_get,

			tdm_tx_sample_rate_put),

	SOC_ENUM_EXT("PRI_TDM_TX_2 SampleRate", tdm_tx_sample_rate,

			tdm_tx_sample_rate_get,

			tdm_tx_sample_rate_put),

	SOC_ENUM_EXT("PRI_TDM_TX_3 SampleRate", tdm_tx_sample_rate,

			tdm_tx_sample_rate_get,

			tdm_tx_sample_rate_put),

	SOC_ENUM_EXT("PRI_TDM_RX_0 Format", tdm_rx_format,

			tdm_rx_format_get,

			tdm_rx_format_put),

	SOC_ENUM_EXT("PRI_TDM_TX_0 Format", tdm_tx_format,

			tdm_tx_format_get,

			tdm_tx_format_put),

	SOC_ENUM_EXT("PRI_TDM_TX_1 Format", tdm_tx_format,

			tdm_tx_format_get,

			tdm_tx_format_put),

	SOC_ENUM_EXT("PRI_TDM_TX_2 Format", tdm_tx_format,

			tdm_tx_format_get,

			tdm_tx_format_put),

	SOC_ENUM_EXT("PRI_TDM_TX_3 Format", tdm_tx_format,

			tdm_tx_format_get,

			tdm_tx_format_put),

	SOC_ENUM_EXT("PRI_TDM_RX_0 Channels", tdm_rx_chs,

			tdm_rx_ch_get,

			tdm_rx_ch_put),

	SOC_ENUM_EXT("PRI_TDM_TX_0 Channels", tdm_tx_chs,

			tdm_tx_ch_get,

			tdm_tx_ch_put),

	SOC_ENUM_EXT("PRI_TDM_TX_1 Channels", tdm_tx_chs,

			tdm_tx_ch_get,

			tdm_tx_ch_put),

	SOC_ENUM_EXT("PRI_TDM_TX_2 Channels", tdm_tx_chs,

			tdm_tx_ch_get,

			tdm_tx_ch_put),

	SOC_ENUM_EXT("PRI_TDM_TX_3 Channels", tdm_tx_chs,

			tdm_tx_ch_get,

			tdm_tx_ch_put),

	SOC_ENUM_EXT("SEC_TDM_RX_0 SampleRate", tdm_rx_sample_rate,

			tdm_rx_sample_rate_get,

			tdm_rx_sample_rate_put),
@@ -7322,6 +7349,78 @@ static struct snd_soc_dai_link msm_common_misc_fe_dai_links[] = { 
	},

};



static struct snd_soc_dai_link msm_ext_common_fe_dai[] = {

	/* Extra FrontEnd DAI Links after compress fe*/

	{/* hw:x,66 */

		.name = MSM_DAILINK_NAME(Media30),

		.stream_name = "MultiMedia30",

		.cpu_dai_name = "MultiMedia30",

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

		.dynamic = 1,

		.dpcm_capture = 1,

		.dpcm_playback = 1,

		.trigger = {SND_SOC_DPCM_TRIGGER_POST,

			 SND_SOC_DPCM_TRIGGER_POST},

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

		.codec_name = "snd-soc-dummy",

		.ignore_suspend = 1,

		.ignore_pmdown_time = 1,

		 /* this dai link has playback support */

		.be_id = MSM_FRONTEND_DAI_MULTIMEDIA30,

	},

	{/* hw:x,67 */

		.name = MSM_DAILINK_NAME(Media31),

		.stream_name = "MultiMedia31",

		.cpu_dai_name = "MultiMedia31",

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

		.dynamic = 1,

		.dpcm_capture = 1,

		.dpcm_playback = 1,

		.trigger = {SND_SOC_DPCM_TRIGGER_POST,

			 SND_SOC_DPCM_TRIGGER_POST},

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

		.codec_name = "snd-soc-dummy",

		.ignore_suspend = 1,

		.ignore_pmdown_time = 1,

		 /* this dai link has playback support */

		.be_id = MSM_FRONTEND_DAI_MULTIMEDIA31,

	},

	{/* hw:x,68 */

		.name = MSM_DAILINK_NAME(Media32),

		.stream_name = "MultiMedia32",

		.cpu_dai_name = "MultiMedia32",

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

		.dynamic = 1,

		.dpcm_capture = 1,

		.dpcm_playback = 1,

		.trigger = {SND_SOC_DPCM_TRIGGER_POST,

			 SND_SOC_DPCM_TRIGGER_POST},

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

		.codec_name = "snd-soc-dummy",

		.ignore_suspend = 1,

		.ignore_pmdown_time = 1,

		 /* this dai link has playback support */

		.be_id = MSM_FRONTEND_DAI_MULTIMEDIA32,

	},

	{/* hw:x,69 */

		.name = MSM_DAILINK_NAME(Media33),

		.stream_name = "MultiMedia33",

		.cpu_dai_name = "MultiMedia33",

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

		.dynamic = 1,

		.dpcm_capture = 1,

		.dpcm_playback = 1,

		.trigger = {SND_SOC_DPCM_TRIGGER_POST,

			 SND_SOC_DPCM_TRIGGER_POST},

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

		.codec_name = "snd-soc-dummy",

		.ignore_suspend = 1,

		.ignore_pmdown_time = 1,

		 /* this dai link has playback support */

		.be_id = MSM_FRONTEND_DAI_MULTIMEDIA33,

	},

};



static struct snd_soc_dai_link msm_common_be_dai_links[] = {

	/* Backend AFE DAI Links */

	{
@@ -8242,6 +8341,48 @@ static struct snd_soc_dai_link msm_auxpcm_be_dai_links[] = { 
};



static struct snd_soc_dai_link msm_ext_tdm_tx_group_be_dai[] = {

	{

		.name = LPASS_BE_PRI_TDM_TX_1,

		.stream_name = "Primary TDM1 Capture",

		.cpu_dai_name = "msm-dai-q6-tdm.36867",

		.platform_name = "msm-pcm-routing",

		.codec_name = "msm-stub-codec.1",

		.codec_dai_name = "msm-stub-tx",

		.no_pcm = 1,

		.dpcm_capture = 1,

		.be_id = MSM_BACKEND_DAI_PRI_TDM_TX_1,

		.be_hw_params_fixup = msm_tdm_be_hw_params_fixup,

		.ops = &msm8998_tdm_be_ops,

		.ignore_suspend = 1,

	},

	{

		.name = LPASS_BE_PRI_TDM_TX_2,

		.stream_name = "Primary TDM2 Capture",

		.cpu_dai_name = "msm-dai-q6-tdm.36869",

		.platform_name = "msm-pcm-routing",

		.codec_name = "msm-stub-codec.1",

		.codec_dai_name = "msm-stub-tx",

		.no_pcm = 1,

		.dpcm_capture = 1,

		.be_id = MSM_BACKEND_DAI_PRI_TDM_TX_2,

		.be_hw_params_fixup = msm_tdm_be_hw_params_fixup,

		.ops = &msm8998_tdm_be_ops,

		.ignore_suspend = 1,

	},

	{

		.name = LPASS_BE_PRI_TDM_TX_3,

		.stream_name = "Primary TDM3 Capture",

		.cpu_dai_name = "msm-dai-q6-tdm.36871",

		.platform_name = "msm-pcm-routing",

		.codec_name = "msm-stub-codec.1",

		.codec_dai_name = "msm-stub-tx",

		.no_pcm = 1,

		.dpcm_capture = 1,

		.be_id = MSM_BACKEND_DAI_PRI_TDM_TX_3,

		.be_hw_params_fixup = msm_tdm_be_hw_params_fixup,

		.ops = &msm8998_tdm_be_ops,

		.ignore_suspend = 1,

	},

	{

		.name = LPASS_BE_QUAT_TDM_TX_1,

		.stream_name = "Quaternary TDM1 Capture",
@@ -8296,7 +8437,8 @@ static struct snd_soc_dai_link msm_tasha_dai_links[ 
			 ARRAY_SIZE(ext_disp_be_dai_link) +

			 ARRAY_SIZE(msm_mi2s_be_dai_links) +

			 ARRAY_SIZE(msm_auxpcm_be_dai_links) +

			 ARRAY_SIZE(msm_ext_tdm_tx_group_be_dai)];

			 ARRAY_SIZE(msm_ext_tdm_tx_group_be_dai) +

			 ARRAY_SIZE(msm_ext_common_fe_dai)];



static struct snd_soc_dai_link msm_tavil_dai_links[

			 ARRAY_SIZE(msm_common_dai_links) +
@@ -8635,7 +8777,7 @@ static struct snd_soc_card *populate_snd_card_dailinks(struct device *dev) 
{

	struct snd_soc_card *card = NULL;

	struct snd_soc_dai_link *dailink;

	int len_1, len_2, len_3, len_4;

	int len_1, len_2, len_3, len_4, len3_t;

	int total_links;

	const struct of_device_id *match;
@@ -8651,7 +8793,8 @@ static struct snd_soc_card *populate_snd_card_dailinks(struct device *dev) 
		len_1 = ARRAY_SIZE(msm_common_dai_links);

		len_2 = len_1 + ARRAY_SIZE(msm_tasha_fe_dai_links);

		len_3 = len_2 + ARRAY_SIZE(msm_common_misc_fe_dai_links);

		len_4 = len_3 + ARRAY_SIZE(msm_common_be_dai_links);

		len3_t = len_3 + ARRAY_SIZE(msm_ext_common_fe_dai);

		len_4 = len3_t + ARRAY_SIZE(msm_common_be_dai_links);

		total_links = len_4 + ARRAY_SIZE(msm_tasha_be_dai_links);

		memcpy(msm_tasha_dai_links,

		       msm_common_dai_links,
@@ -8663,6 +8806,9 @@ static struct snd_soc_card *populate_snd_card_dailinks(struct device *dev) 
		       msm_common_misc_fe_dai_links,

		       sizeof(msm_common_misc_fe_dai_links));

		memcpy(msm_tasha_dai_links + len_3,

		       msm_ext_common_fe_dai,

		       sizeof(msm_ext_common_fe_dai));

		memcpy(msm_tasha_dai_links + len3_t,

		       msm_common_be_dai_links,

		       sizeof(msm_common_be_dai_links));

		memcpy(msm_tasha_dai_links + len_4,

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

+1385 −136

File changed.

Preview size limit exceeded, changes collapsed.

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

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

/* Copyright (c) 2012-2018, 2020, 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
@@ -231,6 +231,10 @@ enum { 
	MSM_FRONTEND_DAI_MULTIMEDIA27,

	MSM_FRONTEND_DAI_MULTIMEDIA28,

	MSM_FRONTEND_DAI_MULTIMEDIA29,

	MSM_FRONTEND_DAI_MULTIMEDIA30,

	MSM_FRONTEND_DAI_MULTIMEDIA31,

	MSM_FRONTEND_DAI_MULTIMEDIA32,

	MSM_FRONTEND_DAI_MULTIMEDIA33,

	MSM_FRONTEND_DAI_CS_VOICE,

	MSM_FRONTEND_DAI_VOIP,

	MSM_FRONTEND_DAI_AFE_RX,
@@ -256,8 +260,8 @@ enum { 
	MSM_FRONTEND_DAI_MAX,

};



#define MSM_FRONTEND_DAI_MM_SIZE (MSM_FRONTEND_DAI_MULTIMEDIA29 + 1)

#define MSM_FRONTEND_DAI_MM_MAX_ID MSM_FRONTEND_DAI_MULTIMEDIA29

#define MSM_FRONTEND_DAI_MM_SIZE (MSM_FRONTEND_DAI_MULTIMEDIA33 + 1)

#define MSM_FRONTEND_DAI_MM_MAX_ID MSM_FRONTEND_DAI_MULTIMEDIA33



enum {

	MSM_BACKEND_DAI_PRI_I2S_RX = 0,