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

Commit c1a5a506 authored by Gangadhar S's avatar Gangadhar S Committed by Gerrit - the friendly Code Review server
Browse files

asoc: sdm660: TDM device grouping changes for capture path 



Add support for multi port in primary TDM capture interface.
Add front end functionality to support TDM group device capture.

Change-Id: Ic1d551beab0cd947d3bb0c378217ccae43e62086
Signed-off-by: default avatarGangadhar S <gangadha@codeaurora.org>
parent 29973d7f

asoc/codecs/msm_stub.c

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

/* Copyright (c) 2011-2014, 2017, 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
@@ -24,9 +24,12 @@ static struct snd_soc_dai_driver msm_stub_dais[] = { 
		.playback = { /* Support maximum range */

			.stream_name = "Playback",

			.channels_min = 1,

			.channels_max = 8,

			.rates = SNDRV_PCM_RATE_8000_48000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

			.channels_max = 16,

			.rates = SNDRV_PCM_RATE_8000_384000,

			.formats = (SNDRV_PCM_FMTBIT_S16_LE |

				    SNDRV_PCM_FMTBIT_S24_LE |

				    SNDRV_PCM_FMTBIT_S24_3LE |

				    SNDRV_PCM_FMTBIT_S32_LE),

		},

	},

	{
@@ -34,10 +37,51 @@ static struct snd_soc_dai_driver msm_stub_dais[] = { 
		.capture = { /* Support maximum range */

			.stream_name = "Record",

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rates = SNDRV_PCM_RATE_8000_48000,

			.formats = (SNDRV_PCM_FMTBIT_S16_LE |

				    SNDRV_PCM_FMTBIT_S24_LE |

				    SNDRV_PCM_FMTBIT_S24_3LE |

				    SNDRV_PCM_FMTBIT_S32_LE),

		},

	},

	{

		.name = "msm-stub-tx1",

		.capture = { /* Support maximum range */

			.stream_name = "Record1",

			.channels_min = 1,

			.channels_max = 16,

			.rates = SNDRV_PCM_RATE_8000_48000,

			.formats = (SNDRV_PCM_FMTBIT_S16_LE |

				    SNDRV_PCM_FMTBIT_S24_LE |

				    SNDRV_PCM_FMTBIT_S24_3LE |

				    SNDRV_PCM_FMTBIT_S32_LE),

		},

	},

	{

		.name = "msm-stub-tx2",

		.capture = { /* Support maximum range */

			.stream_name = "Record2",

			.channels_min = 1,

			.channels_max = 16,

			.rates = SNDRV_PCM_RATE_8000_48000,

			.formats = (SNDRV_PCM_FMTBIT_S16_LE |

				    SNDRV_PCM_FMTBIT_S24_LE |

				    SNDRV_PCM_FMTBIT_S24_3LE |

				    SNDRV_PCM_FMTBIT_S32_LE),

		},

	},

	{

		.name = "msm-stub-tx3",

		.capture = { /* Support maximum range */

			.stream_name = "Record3",

			.channels_min = 1,

			.channels_max = 16,

			.rates = SNDRV_PCM_RATE_8000_48000,

			.formats = (SNDRV_PCM_FMTBIT_S16_LE |

				    SNDRV_PCM_FMTBIT_S24_LE),

				    SNDRV_PCM_FMTBIT_S24_LE |

				    SNDRV_PCM_FMTBIT_S24_3LE |

				    SNDRV_PCM_FMTBIT_S32_LE),

		},

	},

};

asoc/msm-dai-fe.c

+4 −1
Original line number Diff line number Diff line
@@ -2092,7 +2092,10 @@ static struct snd_soc_dai_driver msm_fe_dais[] = { 
			.aif_name = "MM_UL9",

			.rates = (SNDRV_PCM_RATE_8000_48000|

				  SNDRV_PCM_RATE_KNOT),

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

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

asoc/msm-pcm-routing-v2.c

+20 −0
Original line number Diff line number Diff line
@@ -9278,6 +9278,22 @@ static const struct snd_kcontrol_new mmul9_mixer_controls[] = { 
	MSM_BACKEND_DAI_SLIMBUS_6_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA9, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_DOUBLE_EXT("PRI_TDM_TX_0", SND_SOC_NOPM,

	MSM_BACKEND_DAI_PRI_TDM_TX_0,

	MSM_FRONTEND_DAI_MULTIMEDIA9, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_DOUBLE_EXT("PRI_TDM_TX_1", SND_SOC_NOPM,

	MSM_BACKEND_DAI_PRI_TDM_TX_1,

	MSM_FRONTEND_DAI_MULTIMEDIA9, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_DOUBLE_EXT("PRI_TDM_TX_2", SND_SOC_NOPM,

	MSM_BACKEND_DAI_PRI_TDM_TX_2,

	MSM_FRONTEND_DAI_MULTIMEDIA9, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_DOUBLE_EXT("PRI_TDM_TX_3", SND_SOC_NOPM,

	MSM_BACKEND_DAI_PRI_TDM_TX_3,

	MSM_FRONTEND_DAI_MULTIMEDIA9, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_DOUBLE_EXT("TERT_TDM_TX_0", SND_SOC_NOPM,

	MSM_BACKEND_DAI_TERT_TDM_TX_0,

	MSM_FRONTEND_DAI_MULTIMEDIA9, 1, 0, msm_routing_get_audio_mixer,
@@ -17492,6 +17508,10 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"MultiMedia8 Mixer", "QUIN_TDM_TX_2", "QUIN_TDM_TX_2"},

	{"MultiMedia8 Mixer", "QUIN_TDM_TX_3", "QUIN_TDM_TX_3"},









	{"MultiMedia9 Mixer", "PRI_TDM_TX_0", "PRI_TDM_TX_0"},









	{"MultiMedia9 Mixer", "PRI_TDM_TX_1", "PRI_TDM_TX_1"},









	{"MultiMedia9 Mixer", "PRI_TDM_TX_2", "PRI_TDM_TX_2"},









	{"MultiMedia9 Mixer", "PRI_TDM_TX_3", "PRI_TDM_TX_3"},









	{"MultiMedia9 Mixer", "TERT_TDM_TX_0", "TERT_TDM_TX_0"},









	{"MultiMedia9 Mixer", "TERT_TDM_TX_1", "TERT_TDM_TX_1"},









	{"MultiMedia9 Mixer", "TERT_TDM_TX_2", "TERT_TDM_TX_2"},

























asoc/sdm660-common.c



+202
−10




























File changed.
Preview size limit exceeded, changes collapsed.
























asoc/sdm660-ext-dai-links.c



+43
−1






























Original line number
Diff line number
Diff line









/* Copyright (c) 2015-2019, The Linux Foundation. All rights reserved.









/* Copyright (c) 2015-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








@@ -1418,6 +1418,48 @@ static struct snd_soc_dai_link msm_ext_common_be_dai[] = {







		.ops = &msm_tdm_be_ops,









		.ignore_suspend = 1,









	},









	{









		.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-tx1",









		.no_pcm = 1,









		.dpcm_capture = 1,









		.id = MSM_BACKEND_DAI_PRI_TDM_TX_1,









		.be_hw_params_fixup = msm_tdm_be_hw_params_fixup,









		.ops = &msm_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-tx2",









		.no_pcm = 1,









		.dpcm_capture = 1,









		.id = MSM_BACKEND_DAI_PRI_TDM_TX_2,









		.be_hw_params_fixup = msm_tdm_be_hw_params_fixup,









		.ops = &msm_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-tx3",









		.no_pcm = 1,









		.dpcm_capture = 1,









		.id = MSM_BACKEND_DAI_PRI_TDM_TX_3,









		.be_hw_params_fixup = msm_tdm_be_hw_params_fixup,









		.ops = &msm_tdm_be_ops,









		.ignore_suspend = 1,









	},









	{









		.name = LPASS_BE_SEC_TDM_RX_0,









		.stream_name = "Secondary TDM0 Playback",