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

diff --git a/sound/soc/fsl/fsl_aud2htx.c b/sound/soc/fsl/fsl_aud2htx.c
index 4229221..873295f 100644 (file)
--- a/sound/soc/fsl/fsl_aud2htx.c
+++ b/sound/soc/fsl/fsl_aud2htx.c
@@ -103,7 +103,8 @@ static struct snd_soc_dai_driver fsl_aud2htx_dai = {
 };
 
 static const struct snd_soc_component_driver fsl_aud2htx_component = {
-       .name   = "fsl-aud2htx",
+       .name                   = "fsl-aud2htx",
+       .legacy_dai_naming      = 1,
 };
 
 static const struct reg_default fsl_aud2htx_reg_defaults[] = {

diff --git a/sound/soc/fsl/fsl_easrc.c b/sound/soc/fsl/fsl_easrc.c
index be14f84..ea96b0f 100644 (file)
--- a/sound/soc/fsl/fsl_easrc.c
+++ b/sound/soc/fsl/fsl_easrc.c
@@ -1572,9 +1572,10 @@ static struct snd_soc_dai_driver fsl_easrc_dai = {
 };
 
 static const struct snd_soc_component_driver fsl_easrc_component = {
-       .name           = "fsl-easrc-dai",
-       .controls       = fsl_easrc_snd_controls,
-       .num_controls   = ARRAY_SIZE(fsl_easrc_snd_controls),
+       .name                   = "fsl-easrc-dai",
+       .controls               = fsl_easrc_snd_controls,
+       .num_controls           = ARRAY_SIZE(fsl_easrc_snd_controls),
+       .legacy_dai_naming      = 1,
 };
 
 static const struct reg_default fsl_easrc_reg_defaults[] = {

diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c
index 75f7807..5c21fc4 100644 (file)
--- a/sound/soc/fsl/fsl_esai.c
+++ b/sound/soc/fsl/fsl_esai.c
@@ -824,7 +824,8 @@ static struct snd_soc_dai_driver fsl_esai_dai = {
 };
 
 static const struct snd_soc_component_driver fsl_esai_component = {
-       .name           = "fsl-esai",
+       .name                   = "fsl-esai",
+       .legacy_dai_naming      = 1,
 };
 
 static const struct reg_default fsl_esai_reg_defaults[] = {

diff --git a/sound/soc/fsl/fsl_rpmsg.c b/sound/soc/fsl/fsl_rpmsg.c
index 19fd312..bf94838 100644 (file)
--- a/sound/soc/fsl/fsl_rpmsg.c
+++ b/sound/soc/fsl/fsl_rpmsg.c
@@ -135,7 +135,8 @@ static struct snd_soc_dai_driver fsl_rpmsg_dai = {
 };
 
 static const struct snd_soc_component_driver fsl_component = {
-       .name           = "fsl-rpmsg",
+       .name                   = "fsl-rpmsg",
+       .legacy_dai_naming      = 1,
 };
 
 static const struct fsl_rpmsg_soc_data imx7ulp_data = {

diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c
index 4f5bd95..68b5b48 100644 (file)
--- a/sound/soc/fsl/fsl_sai.c
+++ b/sound/soc/fsl/fsl_sai.c
@@ -767,7 +767,8 @@ static struct snd_soc_dai_driver fsl_sai_dai_template = {
 };
 
 static const struct snd_soc_component_driver fsl_component = {
-       .name           = "fsl-sai",
+       .name                   = "fsl-sai",
+       .legacy_dai_naming      = 1,
 };
 
 static struct reg_default fsl_sai_reg_defaults_ofs0[] = {

diff --git a/sound/soc/fsl/fsl_spdif.c b/sound/soc/fsl/fsl_spdif.c
index 42d11ac..0504431 100644 (file)
--- a/sound/soc/fsl/fsl_spdif.c
+++ b/sound/soc/fsl/fsl_spdif.c
@@ -1237,7 +1237,8 @@ static struct snd_soc_dai_driver fsl_spdif_dai = {
 };
 
 static const struct snd_soc_component_driver fsl_spdif_component = {
-       .name           = "fsl-spdif",
+       .name                   = "fsl-spdif",
+       .legacy_dai_naming      = 1,
 };
 
 /* FSL SPDIF REGMAP */

diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index 7dd0c48..c9e0e31 100644 (file)
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -1182,6 +1182,7 @@ static struct snd_soc_dai_driver fsl_ssi_dai_template = {
 
 static const struct snd_soc_component_driver fsl_ssi_component = {
        .name = "fsl-ssi",
+       .legacy_dai_naming = 1,
 };
 
 static struct snd_soc_dai_driver fsl_ssi_ac97_dai = {

diff --git a/sound/soc/fsl/fsl_xcvr.c b/sound/soc/fsl/fsl_xcvr.c
index 55e640c..c043efe 100644 (file)
--- a/sound/soc/fsl/fsl_xcvr.c
+++ b/sound/soc/fsl/fsl_xcvr.c
@@ -911,7 +911,8 @@ static struct snd_soc_dai_driver fsl_xcvr_dai = {
 };
 
 static const struct snd_soc_component_driver fsl_xcvr_comp = {
-       .name = "fsl-xcvr-dai",
+       .name                   = "fsl-xcvr-dai",
+       .legacy_dai_naming      = 1,
 };
 
 static const struct reg_default fsl_xcvr_reg_defaults[] = {

diff --git a/sound/soc/fsl/mpc5200_psc_i2s.c b/sound/soc/fsl/mpc5200_psc_i2s.c
index 3149d59..73f3e61 100644 (file)
--- a/sound/soc/fsl/mpc5200_psc_i2s.c
+++ b/sound/soc/fsl/mpc5200_psc_i2s.c
@@ -148,7 +148,8 @@ static struct snd_soc_dai_driver psc_i2s_dai[] = {{
 } };
 
 static const struct snd_soc_component_driver psc_i2s_component = {
-       .name           = "mpc5200-i2s",
+       .name                   = "mpc5200-i2s",
+       .legacy_dai_naming      = 1,
 };
 
 /* ---------------------------------------------------------------------