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 422922146f2a53b10128f6bd81313c35f6190b1a..873295f59ad7b9dde877ce1f990bb098f77385ca 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 be14f84796cb437b073597957b142893ad723bee..ea96b0fb6b202c475e7c5157e848797f00831035 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 75f7807df29af6cc7bde5970ef7e8345e62429a6..5c21fc490fce1ac1161ac1ce6b1ddaf799a00036 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 19fd312508839aed26bf409649406825607b3335..bf94838bdbefe47ec9a614867f9e4b84663caaba 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 4f5bd9597c746a9fdfdd816741e1d191ede803d9..68b5b488deebd735706a80d482cb4dba6c5ef6fc 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 42d11aca38a106f73547a7ed802f9f3e6c0631af..0504431792cf93e34e1fe6ecc720bfa43f87e5f0 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 7dd0c48cd9ae4c05ed0adced3c9b31b1a40d0c9f..c9e0e31d5b34d43db672c2aaee3d461dc3c247c1 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 55e640cba87d00926bd932d15ded183ae4926f41..c043efe4548d16ea6dd4adca979dba95f93b9f50 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 3149d59ae968d2ce969178b9ee9c845cfef2d2b0..73f3e61f208a7a579478b5b268de91d9e5cb26c2 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,
 };
 
 /* ---------------------------------------------------------------------