Commit 1e63fcc7 authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown

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: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20220623125250.2355471-21-ckeepax@opensource.cirrus.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 7593e008
...@@ -103,7 +103,8 @@ static struct snd_soc_dai_driver fsl_aud2htx_dai = { ...@@ -103,7 +103,8 @@ static struct snd_soc_dai_driver fsl_aud2htx_dai = {
}; };
static const struct snd_soc_component_driver fsl_aud2htx_component = { 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[] = { static const struct reg_default fsl_aud2htx_reg_defaults[] = {
......
...@@ -1572,9 +1572,10 @@ static struct snd_soc_dai_driver fsl_easrc_dai = { ...@@ -1572,9 +1572,10 @@ static struct snd_soc_dai_driver fsl_easrc_dai = {
}; };
static const struct snd_soc_component_driver fsl_easrc_component = { static const struct snd_soc_component_driver fsl_easrc_component = {
.name = "fsl-easrc-dai", .name = "fsl-easrc-dai",
.controls = fsl_easrc_snd_controls, .controls = fsl_easrc_snd_controls,
.num_controls = ARRAY_SIZE(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[] = { static const struct reg_default fsl_easrc_reg_defaults[] = {
......
...@@ -824,7 +824,8 @@ static struct snd_soc_dai_driver fsl_esai_dai = { ...@@ -824,7 +824,8 @@ static struct snd_soc_dai_driver fsl_esai_dai = {
}; };
static const struct snd_soc_component_driver fsl_esai_component = { 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[] = { static const struct reg_default fsl_esai_reg_defaults[] = {
......
...@@ -135,7 +135,8 @@ static struct snd_soc_dai_driver fsl_rpmsg_dai = { ...@@ -135,7 +135,8 @@ static struct snd_soc_dai_driver fsl_rpmsg_dai = {
}; };
static const struct snd_soc_component_driver fsl_component = { 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 = { static const struct fsl_rpmsg_soc_data imx7ulp_data = {
......
...@@ -767,7 +767,8 @@ static struct snd_soc_dai_driver fsl_sai_dai_template = { ...@@ -767,7 +767,8 @@ static struct snd_soc_dai_driver fsl_sai_dai_template = {
}; };
static const struct snd_soc_component_driver fsl_component = { 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[] = { static struct reg_default fsl_sai_reg_defaults_ofs0[] = {
......
...@@ -1237,7 +1237,8 @@ static struct snd_soc_dai_driver fsl_spdif_dai = { ...@@ -1237,7 +1237,8 @@ static struct snd_soc_dai_driver fsl_spdif_dai = {
}; };
static const struct snd_soc_component_driver fsl_spdif_component = { static const struct snd_soc_component_driver fsl_spdif_component = {
.name = "fsl-spdif", .name = "fsl-spdif",
.legacy_dai_naming = 1,
}; };
/* FSL SPDIF REGMAP */ /* FSL SPDIF REGMAP */
......
...@@ -1182,6 +1182,7 @@ static struct snd_soc_dai_driver fsl_ssi_dai_template = { ...@@ -1182,6 +1182,7 @@ static struct snd_soc_dai_driver fsl_ssi_dai_template = {
static const struct snd_soc_component_driver fsl_ssi_component = { static const struct snd_soc_component_driver fsl_ssi_component = {
.name = "fsl-ssi", .name = "fsl-ssi",
.legacy_dai_naming = 1,
}; };
static struct snd_soc_dai_driver fsl_ssi_ac97_dai = { static struct snd_soc_dai_driver fsl_ssi_ac97_dai = {
......
...@@ -911,7 +911,8 @@ static struct snd_soc_dai_driver fsl_xcvr_dai = { ...@@ -911,7 +911,8 @@ static struct snd_soc_dai_driver fsl_xcvr_dai = {
}; };
static const struct snd_soc_component_driver fsl_xcvr_comp = { 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[] = { static const struct reg_default fsl_xcvr_reg_defaults[] = {
......
...@@ -148,7 +148,8 @@ static struct snd_soc_dai_driver psc_i2s_dai[] = {{ ...@@ -148,7 +148,8 @@ static struct snd_soc_dai_driver psc_i2s_dai[] = {{
} }; } };
static const struct snd_soc_component_driver psc_i2s_component = { static const struct snd_soc_component_driver psc_i2s_component = {
.name = "mpc5200-i2s", .name = "mpc5200-i2s",
.legacy_dai_naming = 1,
}; };
/* --------------------------------------------------------------------- /* ---------------------------------------------------------------------
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment