ASoC: rt5514: fix legacy dai naming
authorJason Montleon <jmontleo@redhat.com>
Thu, 3 Nov 2022 14:46:11 +0000 (10:46 -0400)
committerMark Brown <broonie@kernel.org>
Fri, 4 Nov 2022 12:24:53 +0000 (12:24 +0000)
Starting with 6.0-rc1 these messages are logged and the sound card
is unavailable. Adding legacy_dai_naming to the rt5514-spi causes
it to function properly again.

[   16.928454] kbl_r5514_5663_max kbl_r5514_5663_max: ASoC: CPU DAI
spi-PRP0001:00 not registered
[   16.928561] platform kbl_r5514_5663_max: deferred probe pending

Fixes: fc34ece41f71 ("ASoC: Refactor non_legacy_dai_naming flag")
BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=216641
Signed-off-by: Jason Montleon <jmontleo@redhat.com>
Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20221103144612.4431-1-jmontleo@redhat.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/rt5514-spi.c

index 1a25a37..362663a 100644 (file)
@@ -298,13 +298,14 @@ static int rt5514_spi_pcm_new(struct snd_soc_component *component,
 }
 
 static const struct snd_soc_component_driver rt5514_spi_component = {
-       .name           = DRV_NAME,
-       .probe          = rt5514_spi_pcm_probe,
-       .open           = rt5514_spi_pcm_open,
-       .hw_params      = rt5514_spi_hw_params,
-       .hw_free        = rt5514_spi_hw_free,
-       .pointer        = rt5514_spi_pcm_pointer,
-       .pcm_construct  = rt5514_spi_pcm_new,
+       .name                   = DRV_NAME,
+       .probe                  = rt5514_spi_pcm_probe,
+       .open                   = rt5514_spi_pcm_open,
+       .hw_params              = rt5514_spi_hw_params,
+       .hw_free                = rt5514_spi_hw_free,
+       .pointer                = rt5514_spi_pcm_pointer,
+       .pcm_construct          = rt5514_spi_pcm_new,
+       .legacy_dai_naming      = 1,
 };
 
 /**