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

diff --git a/sound/soc/atmel/atmel-classd.c b/sound/soc/atmel/atmel-classd.c
index 74b7b2611aa70988e286baee520060e23f6c7758..87d6d6ed026b321fd0c90bd9c0a5560074f9056a 100644 (file)
--- a/sound/soc/atmel/atmel-classd.c
+++ b/sound/soc/atmel/atmel-classd.c
@@ -458,6 +458,7 @@ static const struct snd_soc_component_driver atmel_classd_cpu_dai_component = {
        .num_controls           = ARRAY_SIZE(atmel_classd_snd_controls),
        .idle_bias_on           = 1,
        .use_pmdown_time        = 1,
+       .legacy_dai_naming      = 1,
 };
 
 /* ASoC sound card */

diff --git a/sound/soc/atmel/atmel-i2s.c b/sound/soc/atmel/atmel-i2s.c
index ba56d6ac7e5715542071f831a37b17948f126220..425d66edbf8671fd6713c5b21f5cea20c2576514 100644 (file)
--- a/sound/soc/atmel/atmel-i2s.c
+++ b/sound/soc/atmel/atmel-i2s.c
@@ -564,7 +564,8 @@ static struct snd_soc_dai_driver atmel_i2s_dai = {
 };
 
 static const struct snd_soc_component_driver atmel_i2s_component = {
-       .name   = "atmel-i2s",
+       .name                   = "atmel-i2s",
+       .legacy_dai_naming      = 1,
 };
 
 static int atmel_i2s_sama5d2_mck_init(struct atmel_i2s_dev *dev,

diff --git a/sound/soc/atmel/atmel-pdmic.c b/sound/soc/atmel/atmel-pdmic.c
index ea34efac2fff5133a6d36c44711f2f9619fbe5ad..77ff12baead5bcef7970a167f03fa4ed1f4f145c 100644 (file)
--- a/sound/soc/atmel/atmel-pdmic.c
+++ b/sound/soc/atmel/atmel-pdmic.c
@@ -481,6 +481,7 @@ static const struct snd_soc_component_driver atmel_pdmic_cpu_dai_component = {
        .num_controls           = ARRAY_SIZE(atmel_pdmic_snd_controls),
        .idle_bias_on           = 1,
        .use_pmdown_time        = 1,
+       .legacy_dai_naming      = 1,
 };
 
 /* ASoC sound card */

diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c
index c92905e343e7ec77f824a60829a8c41ef88cd887..8aae0beadcfe4768e5506bb5145e91684096b7a5 100644 (file)
--- a/sound/soc/atmel/atmel_ssc_dai.c
+++ b/sound/soc/atmel/atmel_ssc_dai.c
@@ -858,9 +858,10 @@ static struct snd_soc_dai_driver atmel_ssc_dai = {
 };
 
 static const struct snd_soc_component_driver atmel_ssc_component = {
-       .name           = "atmel-ssc",
-       .suspend        = atmel_ssc_suspend,
-       .resume         = atmel_ssc_resume,
+       .name                   = "atmel-ssc",
+       .suspend                = atmel_ssc_suspend,
+       .resume                 = atmel_ssc_resume,
+       .legacy_dai_naming      = 1,
 };
 
 static int asoc_ssc_init(struct device *dev)

diff --git a/sound/soc/atmel/mchp-i2s-mcc.c b/sound/soc/atmel/mchp-i2s-mcc.c
index 269eab56b6dd9023e943ff73ec2d8cd02ca741a0..6dfb96c576ff36747fc2ae991f3407cb2827ba17 100644 (file)
--- a/sound/soc/atmel/mchp-i2s-mcc.c
+++ b/sound/soc/atmel/mchp-i2s-mcc.c
@@ -928,7 +928,8 @@ static struct snd_soc_dai_driver mchp_i2s_mcc_dai = {
 };
 
 static const struct snd_soc_component_driver mchp_i2s_mcc_component = {
-       .name   = "mchp-i2s-mcc",
+       .name                   = "mchp-i2s-mcc",
+       .legacy_dai_naming      = 1,
 };
 
 #ifdef CONFIG_OF

diff --git a/sound/soc/atmel/mchp-pdmc.c b/sound/soc/atmel/mchp-pdmc.c
index b9f63705944828001817f3a1668226abea6abe5d..aba7c5cde62c6d856a1cbf1bc14df67a8de738d0 100644 (file)
--- a/sound/soc/atmel/mchp-pdmc.c
+++ b/sound/soc/atmel/mchp-pdmc.c
@@ -423,6 +423,7 @@ static const struct snd_soc_component_driver mchp_pdmc_dai_component = {
        .num_controls = ARRAY_SIZE(mchp_pdmc_snd_controls),
        .open = &mchp_pdmc_open,
        .close = &mchp_pdmc_close,
+       .legacy_dai_naming = 1,
 };
 
 static const unsigned int mchp_pdmc_1mic[] = {1};

diff --git a/sound/soc/atmel/mchp-spdifrx.c b/sound/soc/atmel/mchp-spdifrx.c
index 5fc968483f2c812f8273d35db43c0cd72bda0b5c..0d37b78b94a091c17e2f0dcf8a779b0c69289dda 100644 (file)
--- a/sound/soc/atmel/mchp-spdifrx.c
+++ b/sound/soc/atmel/mchp-spdifrx.c
@@ -846,7 +846,8 @@ static struct snd_soc_dai_driver mchp_spdifrx_dai = {
 };
 
 static const struct snd_soc_component_driver mchp_spdifrx_component = {
-       .name           = "mchp-spdifrx",
+       .name                   = "mchp-spdifrx",
+       .legacy_dai_naming      = 1,
 };
 
 static const struct of_device_id mchp_spdifrx_dt_ids[] = {

diff --git a/sound/soc/atmel/mchp-spdiftx.c b/sound/soc/atmel/mchp-spdiftx.c
index d24380046435296cd83a78e54fb0d055ef5d01ab..78d5bcf0819a36cfa95e6f257673683fc3222ebf 100644 (file)
--- a/sound/soc/atmel/mchp-spdiftx.c
+++ b/sound/soc/atmel/mchp-spdiftx.c
@@ -753,7 +753,8 @@ static struct snd_soc_dai_driver mchp_spdiftx_dai = {
 };
 
 static const struct snd_soc_component_driver mchp_spdiftx_component = {
-       .name           = "mchp-spdiftx",
+       .name                   = "mchp-spdiftx",
+       .legacy_dai_naming      = 1,
 };
 
 static const struct of_device_id mchp_spdiftx_dt_ids[] = {