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

diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c
index 53e3f43816cc22672cabeccaa3fec0e8a642ed06..bc634962a57ee74184acf28aadbdeeee211e1f7d 100644 (file)
--- a/sound/soc/sunxi/sun4i-codec.c
+++ b/sound/soc/sunxi/sun4i-codec.c
@@ -1234,7 +1234,8 @@ static const struct snd_soc_component_driver sun8i_a23_codec_codec = {
 };
 
 static const struct snd_soc_component_driver sun4i_codec_component = {
-       .name = "sun4i-codec",
+       .name                   = "sun4i-codec",
+       .legacy_dai_naming      = 1,
 };
 
 #define SUN4I_CODEC_RATES      SNDRV_PCM_RATE_CONTINUOUS

diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c
index 5be33d07361bdd80377d2e72b2b4b1da8d55bc97..6028871825baea607ce95523417fb377b964fac9 100644 (file)
--- a/sound/soc/sunxi/sun4i-i2s.c
+++ b/sound/soc/sunxi/sun4i-i2s.c
@@ -1125,7 +1125,8 @@ static struct snd_soc_dai_driver sun4i_i2s_dai = {
 };
 
 static const struct snd_soc_component_driver sun4i_i2s_component = {
-       .name   = "sun4i-dai",
+       .name                   = "sun4i-dai",
+       .legacy_dai_naming      = 1,
 };
 
 static bool sun4i_i2s_rd_reg(struct device *dev, unsigned int reg)

diff --git a/sound/soc/sunxi/sun4i-spdif.c b/sound/soc/sunxi/sun4i-spdif.c
index 17090f43150e0a72aedf8f3d35e893780eb2a114..bcceebca915ac80663e3ccbbc8077503f3c6b574 100644 (file)
--- a/sound/soc/sunxi/sun4i-spdif.c
+++ b/sound/soc/sunxi/sun4i-spdif.c
@@ -583,7 +583,8 @@ static const struct of_device_id sun4i_spdif_of_match[] = {
 MODULE_DEVICE_TABLE(of, sun4i_spdif_of_match);
 
 static const struct snd_soc_component_driver sun4i_spdif_component = {
-       .name           = "sun4i-spdif",
+       .name                   = "sun4i-spdif",
+       .legacy_dai_naming      = 1,
 };
 
 static int sun4i_spdif_runtime_suspend(struct device *dev)