Merge "ASoC: msm: add FE DAIs for HFP for SDM660" (1746e615) · Commits · e / devices / android_kernel_sony_msm8998

sound/soc/msm/sdm660-ext-dai-links.c

+34 −1

Original line number	Original line	Diff line number	Diff line
	/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.		/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.
	*		*
	* This program is free software; you can redistribute it and/or modify		* 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		* it under the terms of the GNU General Public License version 2 and
	@@ -1302,6 +1302,39 @@ static struct snd_soc_dai_link msm_ext_common_fe_dai[] = {
	.codec_dai_name = "snd-soc-dummy-dai",		.codec_dai_name = "snd-soc-dummy-dai",
	.codec_name = "snd-soc-dummy",		.codec_name = "snd-soc-dummy",
	},		},
			{/* hw:x,35 */
			.name = "SLIMBUS7 Hostless",
			.stream_name = "SLIMBUS7 Hostless",
			.cpu_dai_name = "SLIMBUS7_HOSTLESS",
			.platform_name = "msm-pcm-hostless",
			.dynamic = 1,
			.dpcm_playback = 1,
			.dpcm_capture = 1,
			.trigger = {SND_SOC_DPCM_TRIGGER_POST,
			SND_SOC_DPCM_TRIGGER_POST},
			.no_host_mode = SND_SOC_DAI_LINK_NO_HOST,
			.ignore_suspend = 1,
			.ignore_pmdown_time = 1,
			.codec_dai_name = "snd-soc-dummy-dai",
			.codec_name = "snd-soc-dummy",
			},
			{/* hw:x,36 */
			.name = "SDM660 HFP TX",
			.stream_name = "MultiMedia6",
			.cpu_dai_name = "MultiMedia6",
			.platform_name = "msm-pcm-loopback",
			.dynamic = 1,
			.dpcm_playback = 1,
			.dpcm_capture = 1,
			.codec_dai_name = "snd-soc-dummy-dai",
			.codec_name = "snd-soc-dummy",
			.trigger = {SND_SOC_DPCM_TRIGGER_POST,
			SND_SOC_DPCM_TRIGGER_POST},
			.ignore_suspend = 1,
			.no_host_mode = SND_SOC_DAI_LINK_NO_HOST,
			.ignore_pmdown_time = 1,
			.be_id = MSM_FRONTEND_DAI_MULTIMEDIA6,
			},
	};		};

	static struct snd_soc_dai_link msm_ext_common_be_dai[] = {		static struct snd_soc_dai_link msm_ext_common_be_dai[] = {

sound/soc/msm/sdm660-internal.c

+18 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2261,11 +2261,28 @@ static struct snd_soc_dai_link msm_int_dai[] = {
	.codec_dai_name = "snd-soc-dummy-dai",		.codec_dai_name = "snd-soc-dummy-dai",
	.codec_name = "snd-soc-dummy",		.codec_name = "snd-soc-dummy",
	},		},
			{/* hw:x,39 */
			.name = "SDM660 HFP TX",
			.stream_name = "MultiMedia6",
			.cpu_dai_name = "MultiMedia6",
			.platform_name = "msm-pcm-loopback",
			.dynamic = 1,
			.dpcm_playback = 1,
			.dpcm_capture = 1,
			.codec_dai_name = "snd-soc-dummy-dai",
			.codec_name = "snd-soc-dummy",
			.trigger = {SND_SOC_DPCM_TRIGGER_POST,
			SND_SOC_DPCM_TRIGGER_POST},
			.ignore_suspend = 1,
			.no_host_mode = SND_SOC_DAI_LINK_NO_HOST,
			.ignore_pmdown_time = 1,
			.be_id = MSM_FRONTEND_DAI_MULTIMEDIA6,
			},
	};		};


	static struct snd_soc_dai_link msm_int_wsa_dai[] = {		static struct snd_soc_dai_link msm_int_wsa_dai[] = {
	{/* hw:x,39 */		{/* hw:x,40 */
	.name = LPASS_BE_INT5_MI2S_TX,		.name = LPASS_BE_INT5_MI2S_TX,
	.stream_name = "INT5_mi2s Capture",		.stream_name = "INT5_mi2s Capture",
	.cpu_dai_name = "msm-dai-q6-mi2s.12",		.cpu_dai_name = "msm-dai-q6-mi2s.12",