| Message ID | 20240204212207.3158914-1-arnd@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 69f8336e2913f12795fa0ec986bf63a8461ebfb9 |
| Headers | show |
| Series | [1/2] ASoC: SOF: amd: fix SND_AMD_SOUNDWIRE_ACPI dependencies | expand |
On Sun, Feb 04, 2024 at 10:22:01PM +0100, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > 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: Please don't needlessly combine tangentially related things into a single series, it just makes things harder to manage when they should go to different branches.
On Sun, 04 Feb 2024 22:22:01 +0100, Arnd Bergmann wrote: > 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! > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/2] ASoC: SOF: amd: fix SND_AMD_SOUNDWIRE_ACPI dependencies commit: 69f8336e2913f12795fa0ec986bf63a8461ebfb9 [2/2] ASoC: fix SND_SOC_WCD939X dependencies commit: b4956275bf88a5708200713707c6c293648d39a9 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/sound/soc/amd/Makefile b/sound/soc/amd/Makefile index 82e1cf864a40..ebbe49c2bbff 100644 --- a/sound/soc/amd/Makefile +++ b/sound/soc/amd/Makefile @@ -15,7 +15,7 @@ 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_SOC_AMD_ACP_COMMON) += acp/ +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/ diff --git a/sound/soc/amd/acp/Kconfig b/sound/soc/amd/acp/Kconfig index b3105ba9c3a3..30590a23ad63 100644 --- a/sound/soc/amd/acp/Kconfig +++ b/sound/soc/amd/acp/Kconfig @@ -101,13 +101,6 @@ config SND_SOC_AMD_MACH_COMMON help This option enables common Machine driver module for ACP. -config SND_AMD_SOUNDWIRE_ACPI - tristate "AMD SoundWire ACPI Support" - depends on ACPI - help - This options enables ACPI helper functions for SoundWire - interface for AMD platforms. - config SND_SOC_AMD_LEGACY_MACH tristate "AMD Legacy Machine Driver Support" depends on X86 && PCI && I2C @@ -123,3 +116,10 @@ config SND_SOC_AMD_SOF_MACH This option enables SOF sound card support for ACP audio. endif # SND_SOC_AMD_ACP_COMMON + +config SND_AMD_SOUNDWIRE_ACPI + tristate + depends on ACPI + help + This options enables ACPI helper functions for SoundWire + interface for AMD platforms.