diff options
| author | Mark Brown <broonie@kernel.org> | 2022-06-29 16:58:08 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2022-06-29 16:58:08 +0100 |
| commit | fc34ece41f7183d522d15dc4189d8df6e8e23737 (patch) | |
| tree | 4c2fe670adda973cb076df3db1ea575e465f85aa /sound/soc/adi | |
| parent | 7ed186642e6218671e27e2a36c86a70c1fba9ef9 (diff) | |
| parent | 01936221278c5af60d82b8e78ca74caa491c0d31 (diff) | |
| download | linux-fc34ece41f7183d522d15dc4189d8df6e8e23737.tar.bz2 | |
ASoC: Refactor non_legacy_dai_naming flag
Merge series from Charles Keepax <ckeepax@opensource.cirrus.com>:
Historically, the legacy DAI naming scheme was applied to platform
drivers and the newer scheme to CODEC drivers. During componentisation
the core lost the knowledge of if a driver was a CODEC or platform, they
were all now components. To continue to support the legacy naming on
older platform drivers a flag was added to the snd_soc_component_driver
structure, non_legacy_dai_naming, to indicate to use the new scheme and
this was applied to all CODECs as part of the migration.
However, a slight issue appears to be developing with respect to this
flag being opt in for the non-legacy scheme, which presumably we want to
be the primary scheme used. Many codec drivers appear to forget to
include this flag:
grep -l -r "snd_soc_component_driver" sound/soc/codecs/*.c |
xargs grep -L "non_legacy_dai_naming" | wc
48 48 556
Whilst in many cases the configuration of the DAIs themselves will cause
the core to apply the new scheme anyway, it would seem more sensible to
change the flag to legacy_dai_naming making the new scheme opt out. This
patch series migrates across to such a scheme.
Diffstat (limited to 'sound/soc/adi')
| -rw-r--r-- | sound/soc/adi/axi-i2s.c | 1 | ||||
| -rw-r--r-- | sound/soc/adi/axi-spdif.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/adi/axi-i2s.c b/sound/soc/adi/axi-i2s.c index 1289cb4e2988..b1342351bff4 100644 --- a/sound/soc/adi/axi-i2s.c +++ b/sound/soc/adi/axi-i2s.c @@ -161,6 +161,7 @@ static struct snd_soc_dai_driver axi_i2s_dai = { static const struct snd_soc_component_driver axi_i2s_component = { .name = "axi-i2s", + .legacy_dai_naming = 1, }; static const struct regmap_config axi_i2s_regmap_config = { diff --git a/sound/soc/adi/axi-spdif.c b/sound/soc/adi/axi-spdif.c index 8d4a6cb4e5c5..51b968ea21da 100644 --- a/sound/soc/adi/axi-spdif.c +++ b/sound/soc/adi/axi-spdif.c @@ -167,6 +167,7 @@ static struct snd_soc_dai_driver axi_spdif_dai = { static const struct snd_soc_component_driver axi_spdif_component = { .name = "axi-spdif", + .legacy_dai_naming = 1, }; static const struct regmap_config axi_spdif_regmap_config = { |