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

Commit fcafe38f authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "asoc: msm: fix FM hosteless capture"

parents 8de838ac f0de7569

asoc/kona.c

+20 −5
Original line number Diff line number Diff line
@@ -4486,10 +4486,25 @@ static struct snd_soc_dai_link msm_common_dai_links[] = { 
		.codec_dai_name = "snd-soc-dummy-dai",

		.codec_name = "snd-soc-dummy",

	},

	{/* hw:x,32 */

		.name = "Tertiary MI2S TX_Hostless",

		.stream_name = "Tertiary MI2S_TX Hostless Capture",

		.cpu_dai_name = "TERT_MI2S_TX_HOSTLESS",

		.platform_name = "msm-pcm-hostless",

		.dynamic = 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",

	},

};



static struct snd_soc_dai_link msm_bolero_fe_dai_links[] = {

	{/* hw:x,32 */

	{/* hw:x,33 */

		.name = LPASS_BE_WSA_CDC_DMA_TX_0,

		.stream_name = "WSA CDC DMA0 Capture",

		.cpu_dai_name = "msm-dai-cdc-dma-dev.45057",
@@ -4505,7 +4520,7 @@ static struct snd_soc_dai_link msm_bolero_fe_dai_links[] = { 
};



static struct snd_soc_dai_link msm_common_misc_fe_dai_links[] = {

	{/* hw:x,33 */

	{/* hw:x,34 */

		.name = MSM_DAILINK_NAME(ASM Loopback),

		.stream_name = "MultiMedia6",

		.cpu_dai_name = "MultiMedia6",
@@ -4522,7 +4537,7 @@ static struct snd_soc_dai_link msm_common_misc_fe_dai_links[] = { 
		.ignore_pmdown_time = 1,

		.id = MSM_FRONTEND_DAI_MULTIMEDIA6,

	},

	{/* hw:x,34 */

	{/* hw:x,35 */

		.name = "USB Audio Hostless",

		.stream_name = "USB Audio Hostless",

		.cpu_dai_name = "USBAUDIO_HOSTLESS",
@@ -4538,7 +4553,7 @@ static struct snd_soc_dai_link msm_common_misc_fe_dai_links[] = { 
		.codec_dai_name = "snd-soc-dummy-dai",

		.codec_name = "snd-soc-dummy",

	},

	{/* hw:x,35 */

	{/* hw:x,36 */

		.name = "SLIMBUS_7 Hostless",

		.stream_name = "SLIMBUS_7 Hostless",

		.cpu_dai_name = "SLIMBUS7_HOSTLESS",
@@ -4554,7 +4569,7 @@ static struct snd_soc_dai_link msm_common_misc_fe_dai_links[] = { 
		.codec_dai_name = "snd-soc-dummy-dai",

		.codec_name = "snd-soc-dummy",

	},

	{/* hw:x,36 */

	{/* hw:x,37 */

		.name = "Compress Capture",

		.stream_name = "Compress9",

		.cpu_dai_name = "MultiMedia17",