github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-24 07:03:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ASoC: SOF: amd: Move depends on AMD_NODE to consumers

Browse Source 
CONFIG_SND_SOC_SOF_AMD_COMMON is a hidden option that is only selected by
other options.  It can't have a direct depends on AMD_NODE because select
can't pick another option automatically.

This was attempted to be fixed in commit b47834ee44 ("ASoC: SOF: amd:
Add depends on CPU_SUP_AMD") but this just masked the issue as it was found
in another config.

Instead move the `depends on AMD_NODE` out of SND_SOC_SOF_AMD_COMMON to
all the consumers and drop `depends on CPU_SUP_AMD`.

Fixes: b47834ee44 ("ASoC: SOF: amd: Add depends on CPU_SUP_AMD")
Fixes: f120cf33d2 ("ASoC: SOF: amd: Use AMD_NODE")
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202502220104.a8P6ApQN-lkp@intel.com/
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
Link: https://patch.msgid.link/20250221181840.2639793-1-superm1@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Mario Limonciello 2025-02-21 12:18:12 -06:00 committed by Mark Brown
parent 2fa56dae1a
commit 91b7512914
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sound/soc/sof/amd/Kconfig
View File

@ -25,7 +25,6 @@ config SND_SOC_SOF_AMD_COMMON
select SND_SOC_SOF_ACP_PROBES
select SND_SOC_ACPI_AMD_MATCH
select SND_SOC_ACPI if ACPI
depends on AMD_NODE
help
This option is not user-selectable but automatically handled by
'select' statements at a higher level
@ -33,7 +32,7 @@ config SND_SOC_SOF_AMD_COMMON
config SND_SOC_SOF_AMD_RENOIR
tristate "SOF support for RENOIR"
depends on SND_SOC_SOF_PCI
depends on CPU_SUP_AMD
depends on AMD_NODE
select SND_SOC_SOF_AMD_COMMON
help
Select this option for SOF support on AMD Renoir platform
@ -41,7 +40,7 @@ config SND_SOC_SOF_AMD_RENOIR
config SND_SOC_SOF_AMD_VANGOGH
tristate "SOF support for VANGOGH"
depends on SND_SOC_SOF_PCI
depends on CPU_SUP_AMD
depends on AMD_NODE
select SND_SOC_SOF_AMD_COMMON
help
Select this option for SOF support
@ -52,7 +51,7 @@ config SND_SOC_SOF_AMD_VANGOGH
config SND_SOC_SOF_AMD_REMBRANDT
tristate "SOF support for REMBRANDT"
depends on SND_SOC_SOF_PCI
depends on CPU_SUP_AMD
depends on AMD_NODE
select SND_SOC_SOF_AMD_COMMON
help
Select this option for SOF support on AMD Rembrandt platform
@ -85,7 +84,7 @@ config SND_SOC_SOF_AMD_SOUNDWIRE
config SND_SOC_SOF_AMD_ACP63
tristate "SOF support for ACP6.3 platform"
depends on SND_SOC_SOF_PCI
depends on CPU_SUP_AMD
depends on AMD_NODE
select SND_SOC_SOF_AMD_COMMON
select SND_SOC_SOF_AMD_SOUNDWIRE_LINK_BASELINE
help
@ -97,7 +96,7 @@ config SND_SOC_SOF_AMD_ACP63
config SND_SOC_SOF_AMD_ACP70
tristate "SOF support for ACP7.0 platform"
depends on SND_SOC_SOF_PCI
depends on CPU_SUP_AMD
depends on AMD_NODE
select SND_SOC_SOF_AMD_COMMON
help
Select this option for SOF support on