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

diff --git a/sound/soc/bcm/bcm2835-i2s.c b/sound/soc/bcm/bcm2835-i2s.c
index e39c8d9f409952235edddacda007b9b7a965e9d0..f4d84774dac72851551456f2981f332ddbd0c1ff 100644 (file)
--- a/sound/soc/bcm/bcm2835-i2s.c
+++ b/sound/soc/bcm/bcm2835-i2s.c
@@ -821,7 +821,8 @@ static const struct regmap_config bcm2835_regmap_config = {
 };
 
 static const struct snd_soc_component_driver bcm2835_i2s_component = {
-       .name           = "bcm2835-i2s-comp",
+       .name                   = "bcm2835-i2s-comp",
+       .legacy_dai_naming      = 1,
 };
 
 static int bcm2835_i2s_probe(struct platform_device *pdev)

diff --git a/sound/soc/bcm/bcm63xx-i2s-whistler.c b/sound/soc/bcm/bcm63xx-i2s-whistler.c
index 527caf430715bc8c0a0b080d448eb26fcfa64c3f..2da1384ffe911a586d659eaa999c2a01d72ff961 100644 (file)
--- a/sound/soc/bcm/bcm63xx-i2s-whistler.c
+++ b/sound/soc/bcm/bcm63xx-i2s-whistler.c
@@ -218,6 +218,7 @@ static struct snd_soc_dai_driver bcm63xx_i2s_dai = {
 
 static const struct snd_soc_component_driver bcm63xx_i2s_component = {
        .name = "bcm63xx",
+       .legacy_dai_naming = 1,
 };
 
 static int bcm63xx_i2s_dev_probe(struct platform_device *pdev)

diff --git a/sound/soc/bcm/cygnus-ssp.c b/sound/soc/bcm/cygnus-ssp.c
index 4bfa2d715ff4dd4843ac7399a775ca2c1fb1eabf..8b7a2157307073ba448c12509f97040c0e127bb8 100644 (file)
--- a/sound/soc/bcm/cygnus-ssp.c
+++ b/sound/soc/bcm/cygnus-ssp.c
@@ -1201,9 +1201,10 @@ static const struct snd_soc_dai_driver cygnus_spdif_dai_info = {
 static struct snd_soc_dai_driver cygnus_ssp_dai[CYGNUS_MAX_PORTS];
 
 static const struct snd_soc_component_driver cygnus_ssp_component = {
-       .name           = "cygnus-audio",
-       .suspend        = cygnus_ssp_suspend,
-       .resume         = cygnus_ssp_resume,
+       .name                   = "cygnus-audio",
+       .suspend                = cygnus_ssp_suspend,
+       .resume                 = cygnus_ssp_resume,
+       .legacy_dai_naming      = 1,
 };
 
 /*