Merge "ASoC: msm8998: Update DAI IDs for DSP HW Transcode loopback" (79a52fb5) · Commits · e / devices / android_kernel_sony_msm8998

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

+39 −0

Original line number	Diff line number	Diff line
		@@ -2750,6 +2750,45 @@ static struct snd_soc_dai_driver msm_fe_dais[] = {
		.name = "MultiMedia25",
		.probe = fe_dai_probe,
		},
		{
		.playback = {
		.stream_name = "MultiMedia26 Playback",
		.aif_name = "MM_DL26",
		.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 = 8,
		.rate_min = 8000,
		.rate_max = 384000,
		},
		.ops = &msm_fe_Multimedia_dai_ops,
		.compress_new = snd_soc_new_compress,
		.name = "MultiMedia26",
		.probe = fe_dai_probe,
		},
		{
		.capture = {
		.stream_name = "MultiMedia27 Capture",
		.aif_name = "MM_UL27",
		.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 = "MultiMedia27",
		.probe = fe_dai_probe,
		},
		};

		static int msm_fe_dai_dev_probe(struct platform_device *pdev)

+4 −4

Original line number	Diff line number	Diff line
		@@ -5509,7 +5509,7 @@ static struct snd_soc_dai_link msm_common_misc_fe_dai_links[] = {
		{
		.name = MSM_DAILINK_NAME(Transcode Loopback Playback),
		.stream_name = "Transcode Loopback Playback",
		.cpu_dai_name = "MultiMedia14",
		.cpu_dai_name = "MultiMedia26",
		.platform_name = "msm-transcode-loopback",
		.dynamic = 1,
		.dpcm_playback = 1,
		@@ -5520,12 +5520,12 @@ static struct snd_soc_dai_link msm_common_misc_fe_dai_links[] = {
		.ignore_suspend = 1,
		.ignore_pmdown_time = 1,
		/* this dainlink has playback support */
		.be_id = MSM_FRONTEND_DAI_MULTIMEDIA14,
		.be_id = MSM_FRONTEND_DAI_MULTIMEDIA26,
		},
		{
		.name = MSM_DAILINK_NAME(Transcode Loopback Capture),
		.stream_name = "Transcode Loopback Capture",
		.cpu_dai_name = "MultiMedia18",
		.cpu_dai_name = "MultiMedia27",
		.platform_name = "msm-transcode-loopback",
		.dynamic = 1,
		.dpcm_capture = 1,
		@@ -5535,7 +5535,7 @@ static struct snd_soc_dai_link msm_common_misc_fe_dai_links[] = {
		.codec_name = "snd-soc-dummy",
		.ignore_suspend = 1,
		.ignore_pmdown_time = 1,
		.be_id = MSM_FRONTEND_DAI_MULTIMEDIA18,
		.be_id = MSM_FRONTEND_DAI_MULTIMEDIA27,
		},
		{
		.name = "MultiMedia21",