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

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

Merge "asoc: qcs405: fix codec dma dai ids"

parents 5bb5ccde 811fbfda

asoc/qcs405.c

+18 −19
Original line number Original line Diff line number Diff line
@@ -6626,7 +6626,7 @@ static struct snd_soc_dai_link msm_va_cdc_dma_be_dai_links[] = { 
	{

	{

		.name = LPASS_BE_VA_CDC_DMA_TX_0,

		.name = LPASS_BE_VA_CDC_DMA_TX_0,

		.stream_name = "VA CDC DMA0 Capture",

		.stream_name = "VA CDC DMA0 Capture",

		.cpu_dai_name = "msm-dai-cdc-dma.49153",

		.cpu_dai_name = "msm-dai-cdc-dma-dev.45089",

		.platform_name = "msm-pcm-routing",

		.platform_name = "msm-pcm-routing",

		.codec_name = "bolero_codec",

		.codec_name = "bolero_codec",

		.codec_dai_name = "va_macro_tx1",

		.codec_dai_name = "va_macro_tx1",
@@ -6641,7 +6641,7 @@ static struct snd_soc_dai_link msm_va_cdc_dma_be_dai_links[] = { 
	{

	{

		.name = LPASS_BE_VA_CDC_DMA_TX_1,

		.name = LPASS_BE_VA_CDC_DMA_TX_1,

		.stream_name = "VA CDC DMA1 Capture",

		.stream_name = "VA CDC DMA1 Capture",

		.cpu_dai_name = "msm-dai-cdc-dma.49155",

		.cpu_dai_name = "msm-dai-cdc-dma-dev.45091",

		.platform_name = "msm-pcm-routing",

		.platform_name = "msm-pcm-routing",

		.codec_name = "bolero_codec",

		.codec_name = "bolero_codec",

		.codec_dai_name = "va_macro_tx2",

		.codec_dai_name = "va_macro_tx2",
@@ -6901,34 +6901,33 @@ static struct snd_soc_dai_link msm_stub_be_dai_links[] = { 




	/* Backend DAI Links */

	/* Backend DAI Links */

	{

	{

		.name = LPASS_BE_SLIMBUS_0_RX,

		.name = LPASS_BE_VA_CDC_DMA_TX_0,

		.stream_name = "Slimbus Playback",

		.stream_name = "VA CDC DMA0 Capture",

		.cpu_dai_name = "msm-dai-q6-dev.16384",

		.cpu_dai_name = "msm-dai-cdc-dma-dev.45089",

		.platform_name = "msm-pcm-routing",

		.platform_name = "msm-pcm-routing",

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

		.codec_name = "bolero_codec",

		.codec_dai_name = "msm-stub-rx",

		.codec_dai_name = "va_macro_tx1",

		.no_pcm = 1,

		.no_pcm = 1,

		.dpcm_playback = 1,

		.dpcm_capture = 1,

		.id = MSM_BACKEND_DAI_SLIMBUS_0_RX,

		.init = &msm_va_cdc_dma_init,

		.init = &msm_audrx_stub_init,

		.id = MSM_BACKEND_DAI_VA_CDC_DMA_TX_0,

		.be_hw_params_fixup = msm_be_hw_params_fixup,

		.be_hw_params_fixup = msm_be_hw_params_fixup,

		.ignore_pmdown_time = 1, /* dai link has playback support */

		.ignore_suspend = 1,

		.ignore_suspend = 1,

		.ops = &msm_stub_be_ops,

		.ops = &msm_cdc_dma_be_ops,

	},

	},

	{

	{

		.name = LPASS_BE_SLIMBUS_0_TX,

		.name = LPASS_BE_VA_CDC_DMA_TX_1,

		.stream_name = "Slimbus Capture",

		.stream_name = "VA CDC DMA1 Capture",

		.cpu_dai_name = "msm-dai-q6-dev.16385",

		.cpu_dai_name = "msm-dai-cdc-dma-dev.45091",

		.platform_name = "msm-pcm-routing",

		.platform_name = "msm-pcm-routing",

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

		.codec_name = "bolero_codec",

		.codec_dai_name = "msm-stub-tx",

		.codec_dai_name = "va_macro_tx2",

		.no_pcm = 1,

		.no_pcm = 1,

		.dpcm_capture = 1,

		.dpcm_capture = 1,

		.id = MSM_BACKEND_DAI_SLIMBUS_0_TX,

		.id = MSM_BACKEND_DAI_VA_CDC_DMA_TX_1,

		.be_hw_params_fixup = msm_be_hw_params_fixup,

		.be_hw_params_fixup = msm_be_hw_params_fixup,

		.ignore_suspend = 1,

		.ignore_suspend = 1,

		.ops = &msm_stub_be_ops,

		.ops = &msm_cdc_dma_be_ops,

	},

	},

};

};