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

diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c
index fdd9561c6a9f361c02b581405bedeab95f515e0c..9505200f3d11b45abd7bf4fe2db12f9c8ac8ca33 100644 (file)
--- a/sound/soc/samsung/i2s.c
+++ b/sound/soc/samsung/i2s.c
@@ -1143,6 +1143,8 @@ static const struct snd_soc_component_driver samsung_i2s_component = {
 
        .suspend = i2s_suspend,
        .resume = i2s_resume,
+
+       .legacy_dai_naming = 1,
 };
 
 #define SAMSUNG_I2S_FMTS (SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_LE | \

diff --git a/sound/soc/samsung/pcm.c b/sound/soc/samsung/pcm.c
index c2eb3534bfccb8bb6af357066e7e4d62a6c1f5ac..e859252ae5e6eb87b29c0a239a4590ca5f43b53f 100644 (file)
--- a/sound/soc/samsung/pcm.c
+++ b/sound/soc/samsung/pcm.c
@@ -480,7 +480,8 @@ static struct snd_soc_dai_driver s3c_pcm_dai[] = {
 };
 
 static const struct snd_soc_component_driver s3c_pcm_component = {
-       .name           = "s3c-pcm",
+       .name                   = "s3c-pcm",
+       .legacy_dai_naming      = 1,
 };
 
 static int s3c_pcm_dev_probe(struct platform_device *pdev)

diff --git a/sound/soc/samsung/s3c2412-i2s.c b/sound/soc/samsung/s3c2412-i2s.c
index ec1c6f9d76ac755652f45e5f8a2c89b3daff681f..0579a352961cca2486f69f81c3189f996ea05c83 100644 (file)
--- a/sound/soc/samsung/s3c2412-i2s.c
+++ b/sound/soc/samsung/s3c2412-i2s.c
@@ -192,9 +192,10 @@ static struct snd_soc_dai_driver s3c2412_i2s_dai = {
 };
 
 static const struct snd_soc_component_driver s3c2412_i2s_component = {
-       .name           = "s3c2412-i2s",
-       .suspend        = s3c2412_i2s_suspend,
-       .resume         = s3c2412_i2s_resume,
+       .name                   = "s3c2412-i2s",
+       .suspend                = s3c2412_i2s_suspend,
+       .resume                 = s3c2412_i2s_resume,
+       .legacy_dai_naming      = 1,
 };
 
 static int s3c2412_iis_dev_probe(struct platform_device *pdev)

diff --git a/sound/soc/samsung/s3c24xx-i2s.c b/sound/soc/samsung/s3c24xx-i2s.c
index 4082ad7cbcc1144507b2b8d8187f1d71f805e308..e760fc8b42636b5d2f4207143a9bc78bd4167a4c 100644 (file)
--- a/sound/soc/samsung/s3c24xx-i2s.c
+++ b/sound/soc/samsung/s3c24xx-i2s.c
@@ -415,9 +415,10 @@ static struct snd_soc_dai_driver s3c24xx_i2s_dai = {
 };
 
 static const struct snd_soc_component_driver s3c24xx_i2s_component = {
-       .name           = "s3c24xx-i2s",
-       .suspend        = s3c24xx_i2s_suspend,
-       .resume         = s3c24xx_i2s_resume,
+       .name                   = "s3c24xx-i2s",
+       .suspend                = s3c24xx_i2s_suspend,
+       .resume                 = s3c24xx_i2s_resume,
+       .legacy_dai_naming      = 1,
 };
 
 static int s3c24xx_iis_dev_probe(struct platform_device *pdev)

diff --git a/sound/soc/samsung/spdif.c b/sound/soc/samsung/spdif.c
index 47b6d19e43ffb648554875b7520e272c31910aaa..7d815e237e5c6f92859d2b302d93410403ef72ec 100644 (file)
--- a/sound/soc/samsung/spdif.c
+++ b/sound/soc/samsung/spdif.c
@@ -352,9 +352,10 @@ static struct snd_soc_dai_driver samsung_spdif_dai = {
 };
 
 static const struct snd_soc_component_driver samsung_spdif_component = {
-       .name           = "samsung-spdif",
-       .suspend        = spdif_suspend,
-       .resume         = spdif_resume,
+       .name                   = "samsung-spdif",
+       .suspend                = spdif_suspend,
+       .resume                 = spdif_resume,
+       .legacy_dai_naming      = 1,
 };
 
 static int spdif_probe(struct platform_device *pdev)