ASoC: amd: vangogh: Drop conflicting ACPI-based probing
authorCristian Ciocaltea <cristian.ciocaltea@collabora.com>
Sat, 9 Dec 2023 20:32:19 +0000 (22:32 +0200)
committerMark Brown <broonie@kernel.org>
Mon, 18 Dec 2023 14:03:49 +0000 (14:03 +0000)
commitddd1ee12a8fb6e4d6f86eddeba64c135eee56623
treeb3139babedad961e79b5bddc5048887aeeb158e8
parentc95a2a0be0b1bba2e051faa105c2e0401fc2de33
ASoC: amd: vangogh: Drop conflicting ACPI-based probing

The Vangogh machine driver variant based on the MAX98388 amplifier, as
found on Valve's Steam Deck OLED, relies on probing via an ACPI match
table.  This worked fine until commit 197b1f7f0df1 ("ASoC: amd: Add new
dmi entries to config entry") enabled SOF support for the target machine
(i.e. Galileo product), causing the sound card to enter the deferred
probe state indefinitely:

$ cat /sys/kernel/debug/devices_deferred
AMDI8821:00 acp5x_mach: Register card (acp5x-max98388) failed

The issue is related to commit e89f45edb747 ("ASoC: amd: vangogh: Add
check for acp config flags in vangogh platform"), which tries to
mitigate potential conflicts between SOF and generic ACP Vangogh
drivers, due to sharing the PCI device IDs.

However, the solution is effective only if the machine driver is
directly probed by pci-acp5x through platform_device_register_full().

Hence, remove the conflicting ACPI based probing and rely exclusively on
DMI quirks for sound card setup.

Fixes: dba22efd0d17 ("ASoC: amd: vangogh: Add support for NAU8821/MAX98388 variant")
Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Link: https://msgid.link/r/20231209203229.878730-2-cristian.ciocaltea@collabora.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/amd/vangogh/acp5x-mach.c