tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

ASoC: SOF: amd: fix SND_AMD_SOUNDWIRE_ACPI dependencies

The snd-amd-sdw-acpi.ko module is under CONFIG_SND_SOC_AMD_ACP_COMMON but
selected from SoF, which causes build failures in some randconfig builds
that enable SOF but not ACP:

WARNING: unmet direct dependencies detected for SND_AMD_SOUNDWIRE_ACPI
Depends on [n]: SOUND [=m] && SND [=m] && SND_SOC [=m] && SND_SOC_AMD_ACP_COMMON [=n] && ACPI [=y]
Selected by [m]:
- SND_SOC_SOF_AMD_SOUNDWIRE_LINK_BASELINE [=m] && SOUND [=m] && SND [=m] && SND_SOC [=m] && SND_SOC_SOF_TOPLEVEL [=y] && SND_SOC_SOF_AMD_TOPLEVEL [=m] && ACPI [=y]
ERROR: modpost: "amd_sdw_scan_controller" [sound/soc/sof/amd/snd-sof-amd-acp.ko] undefined!

Change the Makefile and Kconfig to allow it to get built regardless
of CONFIG_SND_SOC_AMD_ACP_COMMON.

Fixes: d948218424bf ("ASoC: SOF: amd: add code for invoking soundwire manager helper functions")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20240204212207.3158914-1-arnd@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Arnd Bergmann and committed by
Mark Brown 69f8336e c5d74fe6

+8 -8
+1 -1
sound/soc/amd/Makefile
··· 15 15 obj-$(CONFIG_SND_SOC_AMD_RENOIR) += renoir/ 16 16 obj-$(CONFIG_SND_SOC_AMD_ACP5x) += vangogh/ 17 17 obj-$(CONFIG_SND_SOC_AMD_ACP6x) += yc/ 18 - obj-$(CONFIG_SND_SOC_AMD_ACP_COMMON) += acp/ 18 + obj-$(CONFIG_SND_AMD_ACP_CONFIG) += acp/ 19 19 obj-$(CONFIG_SND_AMD_ACP_CONFIG) += snd-acp-config.o 20 20 obj-$(CONFIG_SND_SOC_AMD_RPL_ACP6x) += rpl/ 21 21 obj-$(CONFIG_SND_SOC_AMD_PS) += ps/
+7 -7
sound/soc/amd/acp/Kconfig
··· 101 101 help 102 102 This option enables common Machine driver module for ACP. 103 103 104 - config SND_AMD_SOUNDWIRE_ACPI 105 - tristate "AMD SoundWire ACPI Support" 106 - depends on ACPI 107 - help 108 - This options enables ACPI helper functions for SoundWire 109 - interface for AMD platforms. 110 - 111 104 config SND_SOC_AMD_LEGACY_MACH 112 105 tristate "AMD Legacy Machine Driver Support" 113 106 depends on X86 && PCI && I2C ··· 116 123 This option enables SOF sound card support for ACP audio. 117 124 118 125 endif # SND_SOC_AMD_ACP_COMMON 126 + 127 + config SND_AMD_SOUNDWIRE_ACPI 128 + tristate 129 + depends on ACPI 130 + help 131 + This options enables ACPI helper functions for SoundWire 132 + interface for AMD platforms.