On Wed, 02 Nov 2022 23:05:14 +0100, Pierre-Louis Bossart wrote:
On 11/2/22 16:05, Jason Montleon wrote:
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
Thanks for reporting this regression, much appreciated.
a) you need to CC: maintainers Mark Brown and Takashi Iwai b) the commit title should be something like "ASoC: rt5514: fix legacy dai naming". c) it's not clear if this is actually enough. there's no legacy_dai_naming for e.g. rt5663 and the .endianness member is not set.
IIUC, rt5663.c should be fine; it used to have non_legacy_dai_naming flag and it was dropped after the switch.
But, through a quick glance, rt5677-spi.c seems to be the same pattern as rt5514-spi.c. The rt5677.c was covered properly but the *-spi.c wan't.
Takashi
Adding Charles Keepax for comments.
sound/soc/codecs/rt5514-spi.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/sound/soc/codecs/rt5514-spi.c b/sound/soc/codecs/rt5514-spi.c index 1a25a3787935..362663abcb89 100644 --- a/sound/soc/codecs/rt5514-spi.c +++ b/sound/soc/codecs/rt5514-spi.c @@ -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,
};
/**