[PATCH 0/3] ASoC: amd: acp: Dependency cleanup
Hi all,
This patch series cleans up the dependencies of the various configuration symbols related to AMD Audio-Coprocessor support.
Feel free to squash into a single patch if you prefer that.
Thanks!
Geert Uytterhoeven (3): ASoC: amd: acp: Wrap AMD Audio ACP components in SND_SOC_AMD_ACP_COMMON ASoC: amd: acp: SND_SOC_AMD_{LEGACY_MACH,SOF_MACH} should depend on X86 && PCI && I2C ASoC: amd: acp: SND_SOC_AMD_ACP_COMMON should depend on X86 && PCI
sound/soc/amd/acp/Kconfig | 7 +++++++ 1 file changed, 7 insertions(+)
The build only descends into sound/soc/amd/acp/ if CONFIG_SND_SOC_AMD_ACP_COMMON=y. Hence all later config symbols should depend on SND_SOC_AMD_ACP_COMMON, to prevent asking the user about config symbols for driver code that won't be build anyway.
Fixes: 623621a9f9e1a2f4 ("ASoC: amd: Add common framework to support I2S on ACP SOC") Signed-off-by: Geert Uytterhoeven geert+renesas@glider.be --- sound/soc/amd/acp/Kconfig | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/sound/soc/amd/acp/Kconfig b/sound/soc/amd/acp/Kconfig index 98ec18791d35ff3a..ea186cd31ba220ab 100644 --- a/sound/soc/amd/acp/Kconfig +++ b/sound/soc/amd/acp/Kconfig @@ -12,6 +12,8 @@ config SND_SOC_AMD_ACP_COMMON This option enables common modules for Audio-Coprocessor i.e. ACP IP block on AMD platforms.
+if SND_SOC_AMD_ACP_COMMON + config SND_SOC_AMD_ACP_I2S tristate
@@ -49,3 +51,5 @@ config SND_SOC_AMD_SOF_MACH select SND_SOC_AMD_MACH_COMMON help This option enables SOF sound card support for ACP audio. + +endif # SND_SOC_AMD_ACP_COMMON
If not all of CONFIG_X86, CONFIG_PCI, and CONFIG_I2C are set:
WARNING: unmet direct dependencies detected for SND_SOC_AMD_MACH_COMMON Depends on [n]: SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && X86 && PCI [=y] && I2C [=y] Selected by [y]: - SND_SOC_AMD_LEGACY_MACH [=y] && SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] - SND_SOC_AMD_SOF_MACH [=y] && SOUND [=y] && !UML && SND [=y] && SND_SOC [=y]
As SND_SOC_AMD_MACH_COMMON depends on X86 && PCI && I2C, all symbols selecting it should depend on X86 && PCI && I2C, too.
Fixes: 9d8a7be88b3365e4 ("ASoC: amd: acp: Add legacy sound card support for Chrome audio") Fixes: 9f84940f5004e1d2 ("ASoC: amd: acp: Add SOF audio support on Chrome board") Signed-off-by: Geert Uytterhoeven geert+renesas@glider.be --- sound/soc/amd/acp/Kconfig | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/sound/soc/amd/acp/Kconfig b/sound/soc/amd/acp/Kconfig index ea186cd31ba220ab..006bd2dc5f0444ec 100644 --- a/sound/soc/amd/acp/Kconfig +++ b/sound/soc/amd/acp/Kconfig @@ -43,12 +43,14 @@ config SND_SOC_AMD_MACH_COMMON config SND_SOC_AMD_LEGACY_MACH tristate "AMD Legacy Machine Driver Support" select SND_SOC_AMD_MACH_COMMON + depends on X86 && PCI && I2C help This option enables legacy sound card support for ACP audio.
config SND_SOC_AMD_SOF_MACH tristate "AMD SOF Machine Driver Support" select SND_SOC_AMD_MACH_COMMON + depends on X86 && PCI && I2C help This option enables SOF sound card support for ACP audio.
All configuration symbols for AMD Audio ACP conponents depend on X86 && PCI, except for SND_SOC_AMD_ACP_COMMON. Add a dependency on X86 && PCI to SND_SOC_AMD_ACP_COMMON, to prevent asking the user about AMD Audio ACP support when configuring a kernel without X86 or PCI support.
Signed-off-by: Geert Uytterhoeven geert+renesas@glider.be --- sound/soc/amd/acp/Kconfig | 1 + 1 file changed, 1 insertion(+)
diff --git a/sound/soc/amd/acp/Kconfig b/sound/soc/amd/acp/Kconfig index 006bd2dc5f0444ec..ba6ec96f0a64993d 100644 --- a/sound/soc/amd/acp/Kconfig +++ b/sound/soc/amd/acp/Kconfig @@ -8,6 +8,7 @@ config SND_SOC_AMD_ACP_COMMON tristate "AMD Audio ACP Common support" select SND_AMD_ACP_CONFIG + depends on X86 && PCI help This option enables common modules for Audio-Coprocessor i.e. ACP IP block on AMD platforms.
On Tue, 26 Oct 2021 17:11:20 +0200, Geert Uytterhoeven wrote:
Hi all,
This patch series cleans up the dependencies of the various configuration symbols related to AMD Audio-Coprocessor support.
Feel free to squash into a single patch if you prefer that.
[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/3] ASoC: amd: acp: Wrap AMD Audio ACP components in SND_SOC_AMD_ACP_COMMON commit: f41d2ece95e1b40a708d2f1d5170ebc594df6ca2 [2/3] ASoC: amd: acp: SND_SOC_AMD_{LEGACY_MACH,SOF_MACH} should depend on X86 && PCI && I2C commit: f31c9399738870d0ae8081a65f264f5d103fd180 [3/3] ASoC: amd: acp: SND_SOC_AMD_ACP_COMMON should depend on X86 && PCI commit: 4bf74f8e56054cf3521f646313301d19c331ba54
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
participants (2)
-
Geert Uytterhoeven
-
Mark Brown