From 811fbfda8b13bd52fe1cc28b461804e3ee01fa63 Mon Sep 17 00:00:00 2001 From: Mangesh Kunchamwar Date: Mon, 25 Jun 2018 14:25:12 +0530 Subject: [PATCH] asoc: qcs405: fix codec dma dai ids Fix codec dma dai ids in machine driver same as ids present in DT files. CRs-Fixed: 2248380 Change-Id: I48d121e7343a695d67fc82da0a5c335970ccb819 Signed-off-by: Mangesh Kunchamwar --- asoc/qcs405.c | 49 ++++++++++++++++++++++++------------------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/asoc/qcs405.c b/asoc/qcs405.c index c2d99425676a..80f7acc02dcf 100644 --- a/asoc/qcs405.c +++ b/asoc/qcs405.c @@ -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, .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", .codec_name = "bolero_codec", .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, .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", .codec_name = "bolero_codec", .codec_dai_name = "va_macro_tx2", @@ -6901,34 +6901,33 @@ static struct snd_soc_dai_link msm_stub_be_dai_links[] = { /* Backend DAI Links */ { - .name = LPASS_BE_SLIMBUS_0_RX, - .stream_name = "Slimbus Playback", - .cpu_dai_name = "msm-dai-q6-dev.16384", + .name = LPASS_BE_VA_CDC_DMA_TX_0, + .stream_name = "VA CDC DMA0 Capture", + .cpu_dai_name = "msm-dai-cdc-dma-dev.45089", .platform_name = "msm-pcm-routing", - .codec_name = "msm-stub-codec.1", - .codec_dai_name = "msm-stub-rx", - .no_pcm = 1, - .dpcm_playback = 1, - .id = MSM_BACKEND_DAI_SLIMBUS_0_RX, - .init = &msm_audrx_stub_init, - .be_hw_params_fixup = msm_be_hw_params_fixup, - .ignore_pmdown_time = 1, /* dai link has playback support */ - .ignore_suspend = 1, - .ops = &msm_stub_be_ops, - }, - { - .name = LPASS_BE_SLIMBUS_0_TX, - .stream_name = "Slimbus Capture", - .cpu_dai_name = "msm-dai-q6-dev.16385", - .platform_name = "msm-pcm-routing", - .codec_name = "msm-stub-codec.1", - .codec_dai_name = "msm-stub-tx", + .codec_name = "bolero_codec", + .codec_dai_name = "va_macro_tx1", .no_pcm = 1, .dpcm_capture = 1, - .id = MSM_BACKEND_DAI_SLIMBUS_0_TX, + .init = &msm_va_cdc_dma_init, + .id = MSM_BACKEND_DAI_VA_CDC_DMA_TX_0, .be_hw_params_fixup = msm_be_hw_params_fixup, .ignore_suspend = 1, - .ops = &msm_stub_be_ops, + .ops = &msm_cdc_dma_be_ops, + }, + { + .name = LPASS_BE_VA_CDC_DMA_TX_1, + .stream_name = "VA CDC DMA1 Capture", + .cpu_dai_name = "msm-dai-cdc-dma-dev.45091", + .platform_name = "msm-pcm-routing", + .codec_name = "bolero_codec", + .codec_dai_name = "va_macro_tx2", + .no_pcm = 1, + .dpcm_capture = 1, + .id = MSM_BACKEND_DAI_VA_CDC_DMA_TX_1, + .be_hw_params_fixup = msm_be_hw_params_fixup, + .ignore_suspend = 1, + .ops = &msm_cdc_dma_be_ops, }, };