From f4b4385c98aa4c58c8c328a278021743bd405fb3 Mon Sep 17 00:00:00 2001 From: Sudheer Papothi Date: Tue, 12 Jan 2021 23:50:02 +0530 Subject: [PATCH] ASoC: lpass-cdc: Update codec driver dai link names Update codec driver dai link names for proper enumeration of dai links during sound card enumeration. Change-Id: I91630f60647c83095bc979b09aad1b273b44f71c Signed-off-by: Sudheer Papothi --- asoc/codecs/lpass-cdc/lpass-cdc-rx-macro.c | 4 +-- asoc/codecs/lpass-cdc/lpass-cdc-tx-macro.c | 8 +++--- asoc/codecs/lpass-cdc/lpass-cdc-va-macro.c | 8 +++--- asoc/codecs/lpass-cdc/lpass-cdc-wsa-macro.c | 10 +++---- asoc/msm_dailink.h | 32 ++++++++++----------- 5 files changed, 31 insertions(+), 31 deletions(-) diff --git a/asoc/codecs/lpass-cdc/lpass-cdc-rx-macro.c b/asoc/codecs/lpass-cdc/lpass-cdc-rx-macro.c index 6ed975c659..d2826e844a 100644 --- a/asoc/codecs/lpass-cdc/lpass-cdc-rx-macro.c +++ b/asoc/codecs/lpass-cdc/lpass-cdc-rx-macro.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -/* Copyright (c) 2018-2020, The Linux Foundation. All rights reserved. +/* Copyright (c) 2018-2021, The Linux Foundation. All rights reserved. */ #include @@ -724,7 +724,7 @@ static struct snd_soc_dai_driver lpass_cdc_rx_macro_dai[] = { .ops = &lpass_cdc_rx_macro_dai_ops, }, { - .name = "lpass_cdc_rx_macro_echo", + .name = "rx_macro_echo", .id = RX_MACRO_AIF_ECHO, .capture = { .stream_name = "RX_AIF_ECHO Capture", diff --git a/asoc/codecs/lpass-cdc/lpass-cdc-tx-macro.c b/asoc/codecs/lpass-cdc/lpass-cdc-tx-macro.c index ff8b037e28..3991f68036 100644 --- a/asoc/codecs/lpass-cdc/lpass-cdc-tx-macro.c +++ b/asoc/codecs/lpass-cdc/lpass-cdc-tx-macro.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -/* Copyright (c) 2018-2020, The Linux Foundation. All rights reserved. +/* Copyright (c) 2018-2021, The Linux Foundation. All rights reserved. */ #include @@ -1190,7 +1190,7 @@ static struct snd_soc_dai_ops lpass_cdc_tx_macro_dai_ops = { static struct snd_soc_dai_driver lpass_cdc_tx_macro_dai[] = { { - .name = "lpass_cdc_tx_macro_tx1", + .name = "tx_macro_tx1", .id = LPASS_CDC_TX_MACRO_AIF1_CAP, .capture = { .stream_name = "TX_AIF1 Capture", @@ -1204,7 +1204,7 @@ static struct snd_soc_dai_driver lpass_cdc_tx_macro_dai[] = { .ops = &lpass_cdc_tx_macro_dai_ops, }, { - .name = "lpass_cdc_tx_macro_tx2", + .name = "tx_macro_tx2", .id = LPASS_CDC_TX_MACRO_AIF2_CAP, .capture = { .stream_name = "TX_AIF2 Capture", @@ -1218,7 +1218,7 @@ static struct snd_soc_dai_driver lpass_cdc_tx_macro_dai[] = { .ops = &lpass_cdc_tx_macro_dai_ops, }, { - .name = "lpass_cdc_tx_macro_tx3", + .name = "tx_macro_tx3", .id = LPASS_CDC_TX_MACRO_AIF3_CAP, .capture = { .stream_name = "TX_AIF3 Capture", diff --git a/asoc/codecs/lpass-cdc/lpass-cdc-va-macro.c b/asoc/codecs/lpass-cdc/lpass-cdc-va-macro.c index 6a28065280..2497dbd2e6 100644 --- a/asoc/codecs/lpass-cdc/lpass-cdc-va-macro.c +++ b/asoc/codecs/lpass-cdc/lpass-cdc-va-macro.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -/* Copyright (c) 2018-2020, The Linux Foundation. All rights reserved. +/* Copyright (c) 2018-2021, The Linux Foundation. All rights reserved. */ #include @@ -1545,7 +1545,7 @@ static struct snd_soc_dai_ops lpass_cdc_va_macro_dai_ops = { static struct snd_soc_dai_driver lpass_cdc_va_macro_dai[] = { { - .name = "lpass_cdc_va_macro_tx1", + .name = "va_macro_tx1", .id = LPASS_CDC_VA_MACRO_AIF1_CAP, .capture = { .stream_name = "VA_AIF1 Capture", @@ -1559,7 +1559,7 @@ static struct snd_soc_dai_driver lpass_cdc_va_macro_dai[] = { .ops = &lpass_cdc_va_macro_dai_ops, }, { - .name = "lpass_cdc_va_macro_tx2", + .name = "va_macro_tx2", .id = LPASS_CDC_VA_MACRO_AIF2_CAP, .capture = { .stream_name = "VA_AIF2 Capture", @@ -1573,7 +1573,7 @@ static struct snd_soc_dai_driver lpass_cdc_va_macro_dai[] = { .ops = &lpass_cdc_va_macro_dai_ops, }, { - .name = "lpass_cdc_va_macro_tx3", + .name = "va_macro_tx3", .id = LPASS_CDC_VA_MACRO_AIF3_CAP, .capture = { .stream_name = "VA_AIF3 Capture", diff --git a/asoc/codecs/lpass-cdc/lpass-cdc-wsa-macro.c b/asoc/codecs/lpass-cdc/lpass-cdc-wsa-macro.c index 72ae33e9a4..dc1c288a05 100644 --- a/asoc/codecs/lpass-cdc/lpass-cdc-wsa-macro.c +++ b/asoc/codecs/lpass-cdc/lpass-cdc-wsa-macro.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -/* Copyright (c) 2018-2020, The Linux Foundation. All rights reserved. +/* Copyright (c) 2018-2021, The Linux Foundation. All rights reserved. */ #include @@ -409,7 +409,7 @@ static struct snd_soc_dai_ops lpass_cdc_wsa_macro_dai_ops = { static struct snd_soc_dai_driver lpass_cdc_wsa_macro_dai[] = { { - .name = "lpass_cdc_wsa_macro_rx1", + .name = "wsa_macro_rx1", .id = LPASS_CDC_WSA_MACRO_AIF1_PB, .playback = { .stream_name = "WSA_AIF1 Playback", @@ -423,7 +423,7 @@ static struct snd_soc_dai_driver lpass_cdc_wsa_macro_dai[] = { .ops = &lpass_cdc_wsa_macro_dai_ops, }, { - .name = "lpass_cdc_wsa_macro_rx_mix", + .name = "wsa_macro_rx_mix", .id = LPASS_CDC_WSA_MACRO_AIF_MIX1_PB, .playback = { .stream_name = "WSA_AIF_MIX1 Playback", @@ -437,7 +437,7 @@ static struct snd_soc_dai_driver lpass_cdc_wsa_macro_dai[] = { .ops = &lpass_cdc_wsa_macro_dai_ops, }, { - .name = "lpass_cdc_wsa_macro_vifeedback", + .name = "wsa_macro_vifeedback", .id = LPASS_CDC_WSA_MACRO_AIF_VI, .capture = { .stream_name = "WSA_AIF_VI Capture", @@ -451,7 +451,7 @@ static struct snd_soc_dai_driver lpass_cdc_wsa_macro_dai[] = { .ops = &lpass_cdc_wsa_macro_dai_ops, }, { - .name = "lpass_cdc_wsa_macro_echo", + .name = "wsa_macro_echo", .id = LPASS_CDC_WSA_MACRO_AIF_ECHO, .capture = { .stream_name = "WSA_AIF_ECHO Capture", diff --git a/asoc/msm_dailink.h b/asoc/msm_dailink.h index 0ec53d8c52..e35bc19a5b 100644 --- a/asoc/msm_dailink.h +++ b/asoc/msm_dailink.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* - * Copyright (c) 2020, The Linux Foundation. All rights reserved. + * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. */ #include @@ -51,70 +51,70 @@ SND_SOC_DAILINK_DEFS(auxpcm_tx, SND_SOC_DAILINK_DEFS(wsa_dma_rx0, DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")), - DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "wsa_macro_rx1"), + DAILINK_COMP_ARRAY(COMP_CODEC("lpass-cdc", "wsa_macro_rx1"), COMP_CODEC("wsa-codec1", "wsa_rx1"), COMP_CODEC("wsa-codec2", "wsa_rx2")), DAILINK_COMP_ARRAY(COMP_PLATFORM("snd-soc-dummy"))); SND_SOC_DAILINK_DEFS(wsa_dma_rx1, DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")), - DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "wsa_macro_rx_mix"), + DAILINK_COMP_ARRAY(COMP_CODEC("lpass-cdc", "wsa_macro_rx_mix"), COMP_CODEC("wsa-codec1", "wsa_rx1"), COMP_CODEC("wsa-codec2", "wsa_rx2")), DAILINK_COMP_ARRAY(COMP_PLATFORM("snd-soc-dummy"))); SND_SOC_DAILINK_DEFS(wsa_dma_tx1, DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")), - DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "wsa_macro_echo"), + DAILINK_COMP_ARRAY(COMP_CODEC("lpass-cdc", "wsa_macro_echo"), COMP_CODEC("wsa-codec1", "wsa_rx1"), COMP_CODEC("wsa-codec2", "wsa_rx2")), DAILINK_COMP_ARRAY(COMP_PLATFORM("snd-soc-dummy"))); SND_SOC_DAILINK_DEFS(rx_dma_rx0, DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")), - DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "rx_macro_rx1"), + DAILINK_COMP_ARRAY(COMP_CODEC("lpass-cdc", "rx_macro_rx1"), COMP_CODEC("wcd938x_codec", "wcd938x_cdc")), DAILINK_COMP_ARRAY(COMP_PLATFORM("snd-soc-dummy"))); SND_SOC_DAILINK_DEFS(rx_dma_rx1, DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")), - DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "rx_macro_rx2"), + DAILINK_COMP_ARRAY(COMP_CODEC("lpass-cdc", "rx_macro_rx2"), COMP_CODEC("wcd938x_codec", "wcd938x_cdc")), DAILINK_COMP_ARRAY(COMP_PLATFORM("snd-soc-dummy"))); SND_SOC_DAILINK_DEFS(rx_dma_rx2, DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")), - DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "rx_macro_rx3"), + DAILINK_COMP_ARRAY(COMP_CODEC("lpass-cdc", "rx_macro_rx3"), COMP_CODEC("wcd938x_codec", "wcd938x_cdc")), DAILINK_COMP_ARRAY(COMP_PLATFORM("snd-soc-dummy"))); SND_SOC_DAILINK_DEFS(rx_dma_rx3, DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")), - DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "rx_macro_rx4"), + DAILINK_COMP_ARRAY(COMP_CODEC("lpass-cdc", "rx_macro_rx4"), COMP_CODEC("wcd938x_codec", "wcd938x_cdc")), DAILINK_COMP_ARRAY(COMP_PLATFORM("snd-soc-dummy"))); SND_SOC_DAILINK_DEFS(rx_dma_rx5, DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")), - DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "rx_macro_rx5"), + DAILINK_COMP_ARRAY(COMP_CODEC("lpass-cdc", "rx_macro_rx5"), COMP_CODEC("wcd938x_codec", "wcd938x_cdc")), DAILINK_COMP_ARRAY(COMP_PLATFORM("snd-soc-dummy"))); SND_SOC_DAILINK_DEFS(rx_dma_rx6, DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")), - DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "rx_macro_rx6"), + DAILINK_COMP_ARRAY(COMP_CODEC("lpass-cdc", "rx_macro_rx6"), COMP_CODEC("swr-haptics", "swr_haptics")), DAILINK_COMP_ARRAY(COMP_PLATFORM("snd-soc-dummy"))); SND_SOC_DAILINK_DEFS(tx_dma_tx3, DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")), - DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "tx_macro_tx1"), + DAILINK_COMP_ARRAY(COMP_CODEC("lpass-cdc", "tx_macro_tx1"), COMP_CODEC("wcd938x_codec", "wcd938x_cdc")), DAILINK_COMP_ARRAY(COMP_PLATFORM("snd-soc-dummy"))); SND_SOC_DAILINK_DEFS(tx_dma_tx4, DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")), - DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "tx_macro_tx2"), + DAILINK_COMP_ARRAY(COMP_CODEC("lpass-cdc", "tx_macro_tx2"), COMP_CODEC("wcd938x_codec", "wcd938x_cdc"), COMP_CODEC("swr-dmic.01", "swr_dmic_tx0"), COMP_CODEC("swr-dmic.02", "swr_dmic_tx1"), @@ -124,17 +124,17 @@ SND_SOC_DAILINK_DEFS(tx_dma_tx4, SND_SOC_DAILINK_DEFS(va_dma_tx0, DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")), - DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "va_macro_tx1")), + DAILINK_COMP_ARRAY(COMP_CODEC("lpass-cdc", "va_macro_tx1")), DAILINK_COMP_ARRAY(COMP_PLATFORM("snd-soc-dummy"))); SND_SOC_DAILINK_DEFS(va_dma_tx1, DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")), - DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "va_macro_tx2")), + DAILINK_COMP_ARRAY(COMP_CODEC("lpass-cdc", "va_macro_tx2")), DAILINK_COMP_ARRAY(COMP_PLATFORM("snd-soc-dummy"))); SND_SOC_DAILINK_DEFS(va_dma_tx2, DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")), - DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "va_macro_tx3")), + DAILINK_COMP_ARRAY(COMP_CODEC("lpass-cdc", "va_macro_tx3")), DAILINK_COMP_ARRAY(COMP_PLATFORM("snd-soc-dummy"))); SND_SOC_DAILINK_DEFS(proxy_tx, @@ -169,7 +169,7 @@ SND_SOC_DAILINK_DEFS(pri_tdm_tx_0, SND_SOC_DAILINK_DEFS(vi_feedback, DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")), - DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "wsa_macro_vifeedback")), + DAILINK_COMP_ARRAY(COMP_CODEC("lpass-cdc", "wsa_macro_vifeedback")), DAILINK_COMP_ARRAY(COMP_PLATFORM("snd-soc-dummy"))); SND_SOC_DAILINK_DEFS(tavil_i2s_rx1,