ASoC: meson: 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-17-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/meson/axg-frddr.c b/sound/soc/meson/axg-frddr.c
index 37f4bb3..61f9d41 100644 (file)
--- a/sound/soc/meson/axg-frddr.c
+++ b/sound/soc/meson/axg-frddr.c
@@ -161,6 +161,7 @@ static const struct snd_soc_component_driver axg_frddr_component_drv = {
        .hw_free                = axg_fifo_pcm_hw_free,
        .pointer                = axg_fifo_pcm_pointer,
        .trigger                = axg_fifo_pcm_trigger,
+       .legacy_dai_naming      = 1,
 };
 
 static const struct axg_fifo_match_data axg_frddr_match_data = {
@@ -286,6 +287,7 @@ static const struct snd_soc_component_driver g12a_frddr_component_drv = {
        .hw_free                = axg_fifo_pcm_hw_free,
        .pointer                = axg_fifo_pcm_pointer,
        .trigger                = axg_fifo_pcm_trigger,
+       .legacy_dai_naming      = 1,
 };
 
 static const struct axg_fifo_match_data g12a_frddr_match_data = {
@@ -356,6 +358,7 @@ static const struct snd_soc_component_driver sm1_frddr_component_drv = {
        .hw_free                = axg_fifo_pcm_hw_free,
        .pointer                = axg_fifo_pcm_pointer,
        .trigger                = axg_fifo_pcm_trigger,
+       .legacy_dai_naming      = 1,
 };
 
 static const struct axg_fifo_match_data sm1_frddr_match_data = {

diff --git a/sound/soc/meson/axg-pdm.c b/sound/soc/meson/axg-pdm.c
index 672e43a..88ac582 100644 (file)
--- a/sound/soc/meson/axg-pdm.c
+++ b/sound/soc/meson/axg-pdm.c
@@ -457,7 +457,9 @@ static struct snd_soc_dai_driver axg_pdm_dai_drv = {
        .remove         = axg_pdm_dai_remove,
 };
 
-static const struct snd_soc_component_driver axg_pdm_component_drv = {};
+static const struct snd_soc_component_driver axg_pdm_component_drv = {
+       .legacy_dai_naming = 1,
+};
 
 static const struct regmap_config axg_pdm_regmap_cfg = {
        .reg_bits       = 32,

diff --git a/sound/soc/meson/axg-spdifin.c b/sound/soc/meson/axg-spdifin.c
index 4ba44e0..e2cc4c4 100644 (file)
--- a/sound/soc/meson/axg-spdifin.c
+++ b/sound/soc/meson/axg-spdifin.c
@@ -390,6 +390,7 @@ static const struct snd_kcontrol_new axg_spdifin_controls[] = {
 static const struct snd_soc_component_driver axg_spdifin_component_drv = {
        .controls               = axg_spdifin_controls,
        .num_controls           = ARRAY_SIZE(axg_spdifin_controls),
+       .legacy_dai_naming      = 1,
 };
 
 static const struct regmap_config axg_spdifin_regmap_cfg = {

diff --git a/sound/soc/meson/axg-spdifout.c b/sound/soc/meson/axg-spdifout.c
index 3960d08..e8a12f1 100644 (file)
--- a/sound/soc/meson/axg-spdifout.c
+++ b/sound/soc/meson/axg-spdifout.c
@@ -383,6 +383,7 @@ static const struct snd_soc_component_driver axg_spdifout_component_drv = {
        .dapm_routes            = axg_spdifout_dapm_routes,
        .num_dapm_routes        = ARRAY_SIZE(axg_spdifout_dapm_routes),
        .set_bias_level         = axg_spdifout_set_bias_level,
+       .legacy_dai_naming      = 1,
 };
 
 static const struct regmap_config axg_spdifout_regmap_cfg = {

diff --git a/sound/soc/meson/axg-toddr.c b/sound/soc/meson/axg-toddr.c
index d6adf7e..e9208e7 100644 (file)
--- a/sound/soc/meson/axg-toddr.c
+++ b/sound/soc/meson/axg-toddr.c
@@ -182,6 +182,7 @@ static const struct snd_soc_component_driver axg_toddr_component_drv = {
        .hw_free                = axg_fifo_pcm_hw_free,
        .pointer                = axg_fifo_pcm_pointer,
        .trigger                = axg_fifo_pcm_trigger,
+       .legacy_dai_naming      = 1,
 };
 
 static const struct axg_fifo_match_data axg_toddr_match_data = {
@@ -242,6 +243,7 @@ static const struct snd_soc_component_driver g12a_toddr_component_drv = {
        .hw_free                = axg_fifo_pcm_hw_free,
        .pointer                = axg_fifo_pcm_pointer,
        .trigger                = axg_fifo_pcm_trigger,
+       .legacy_dai_naming      = 1,
 };
 
 static const struct axg_fifo_match_data g12a_toddr_match_data = {
@@ -312,6 +314,7 @@ static const struct snd_soc_component_driver sm1_toddr_component_drv = {
        .hw_free                = axg_fifo_pcm_hw_free,
        .pointer                = axg_fifo_pcm_pointer,
        .trigger                = axg_fifo_pcm_trigger,
+       .legacy_dai_naming      = 1,
 };
 
 static const struct axg_fifo_match_data sm1_toddr_match_data = {