ASoC: qcom: Migrate to new style legacy DAI naming flag

Change the legacy DAI naming flag from opting in to the new scheme
(non_legacy_dai_naming), to opting out of it (legacy_dai_naming).
These drivers appear to be on the CPU side of the DAI link and
currently uses the legacy naming, so add the new flag.

Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20220623125250.2355471-25-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/qcom/lpass-cpu.c b/sound/soc/qcom/lpass-cpu.c
index e6846ad..6f1cd38 100644 (file)
--- a/sound/soc/qcom/lpass-cpu.c
+++ b/sound/soc/qcom/lpass-cpu.c
@@ -472,6 +472,7 @@ static int asoc_qcom_of_xlate_dai_name(struct snd_soc_component *component,
 static const struct snd_soc_component_driver lpass_cpu_comp_driver = {
        .name = "lpass-cpu",
        .of_xlate_dai_name = asoc_qcom_of_xlate_dai_name,
+       .legacy_dai_naming = 1,
 };
 
 static bool lpass_cpu_regmap_writeable(struct device *dev, unsigned int reg)

diff --git a/sound/soc/qcom/qdsp6/q6asm-dai.c b/sound/soc/qcom/qdsp6/q6asm-dai.c
index b74b677..5fc8088 100644 (file)
--- a/sound/soc/qcom/qdsp6/q6asm-dai.c
+++ b/sound/soc/qcom/qdsp6/q6asm-dai.c
@@ -1205,17 +1205,18 @@ static const struct snd_soc_dapm_widget q6asm_dapm_widgets[] = {
 };
 
 static const struct snd_soc_component_driver q6asm_fe_dai_component = {
-       .name           = DRV_NAME,
-       .open           = q6asm_dai_open,
-       .hw_params      = q6asm_dai_hw_params,
-       .close          = q6asm_dai_close,
-       .prepare        = q6asm_dai_prepare,
-       .trigger        = q6asm_dai_trigger,
-       .pointer        = q6asm_dai_pointer,
-       .pcm_construct  = q6asm_dai_pcm_new,
-       .compress_ops   = &q6asm_dai_compress_ops,
-       .dapm_widgets   = q6asm_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(q6asm_dapm_widgets),
+       .name                   = DRV_NAME,
+       .open                   = q6asm_dai_open,
+       .hw_params              = q6asm_dai_hw_params,
+       .close                  = q6asm_dai_close,
+       .prepare                = q6asm_dai_prepare,
+       .trigger                = q6asm_dai_trigger,
+       .pointer                = q6asm_dai_pointer,
+       .pcm_construct          = q6asm_dai_pcm_new,
+       .compress_ops           = &q6asm_dai_compress_ops,
+       .dapm_widgets           = q6asm_dapm_widgets,
+       .num_dapm_widgets       = ARRAY_SIZE(q6asm_dapm_widgets),
+       .legacy_dai_naming      = 1,
 };
 
 static struct snd_soc_dai_driver q6asm_fe_dais_template[] = {