mirror of
https://github.com/torvalds/linux.git
synced 2024-11-15 00:21:59 +00:00
69f8336e29
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: d948218424 ("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>
22 lines
1006 B
Makefile
22 lines
1006 B
Makefile
# SPDX-License-Identifier: GPL-2.0-only
|
|
acp_audio_dma-objs := acp-pcm-dma.o
|
|
snd-soc-acp-da7219mx98357-mach-objs := acp-da7219-max98357a.o
|
|
snd-soc-acp-rt5645-mach-objs := acp-rt5645.o
|
|
snd-soc-acp-es8336-mach-objs := acp-es8336.o
|
|
snd-soc-acp-rt5682-mach-objs := acp3x-rt5682-max9836.o
|
|
snd-acp-config-objs := acp-config.o
|
|
|
|
obj-$(CONFIG_SND_SOC_AMD_ACP) += acp_audio_dma.o
|
|
obj-$(CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH) += snd-soc-acp-da7219mx98357-mach.o
|
|
obj-$(CONFIG_SND_SOC_AMD_CZ_RT5645_MACH) += snd-soc-acp-rt5645-mach.o
|
|
obj-$(CONFIG_SND_SOC_AMD_ST_ES8336_MACH) += snd-soc-acp-es8336-mach.o
|
|
obj-$(CONFIG_SND_SOC_AMD_ACP3x) += raven/
|
|
obj-$(CONFIG_SND_SOC_AMD_RV_RT5682_MACH) += snd-soc-acp-rt5682-mach.o
|
|
obj-$(CONFIG_SND_SOC_AMD_RENOIR) += renoir/
|
|
obj-$(CONFIG_SND_SOC_AMD_ACP5x) += vangogh/
|
|
obj-$(CONFIG_SND_SOC_AMD_ACP6x) += yc/
|
|
obj-$(CONFIG_SND_AMD_ACP_CONFIG) += acp/
|
|
obj-$(CONFIG_SND_AMD_ACP_CONFIG) += snd-acp-config.o
|
|
obj-$(CONFIG_SND_SOC_AMD_RPL_ACP6x) += rpl/
|
|
obj-$(CONFIG_SND_SOC_AMD_PS) += ps/
|