aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/generic
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2022-06-29 16:58:08 +0100
committerMark Brown <broonie@kernel.org>2022-06-29 16:58:08 +0100
commitfc34ece41f7183d522d15dc4189d8df6e8e23737 (patch)
tree4c2fe670adda973cb076df3db1ea575e465f85aa /sound/soc/generic
parentASoC: codecs: add WSA883x support (diff)
parentASoC: soc-component: Remove non_legacy_dai_naming flag (diff)
downloadlinux-dev-fc34ece41f7183d522d15dc4189d8df6e8e23737.tar.xz
linux-dev-fc34ece41f7183d522d15dc4189d8df6e8e23737.zip
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/generic')
-rw-r--r--sound/soc/generic/test-component.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/generic/test-component.c b/sound/soc/generic/test-component.c
index d28712fabe3f..98c8990596a8 100644
--- a/sound/soc/generic/test-component.c
+++ b/sound/soc/generic/test-component.c
@@ -564,11 +564,11 @@ static int test_driver_probe(struct platform_device *pdev)
cdriv->pcm_construct = test_component_pcm_construct;
cdriv->pointer = test_component_pointer;
cdriv->trigger = test_component_trigger;
+ cdriv->legacy_dai_naming = 1;
} else {
cdriv->name = "test_codec";
cdriv->idle_bias_on = 1;
cdriv->endianness = 1;
- cdriv->non_legacy_dai_naming = 1;
}
cdriv->open = test_component_open;