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: Move depends on AMD_NODE to consumers

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 b47834ee4485b ("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: b47834ee4485b ("ASoC: SOF: amd: Add depends on CPU_SUP_AMD")
Fixes: f120cf33d232 ("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>

authored by

Mario Limonciello and committed by
Mark Brown 91b75129 2fa56dae

+5 -6
+5 -6
sound/soc/sof/amd/Kconfig
··· 25 25 select SND_SOC_SOF_ACP_PROBES 26 26 select SND_SOC_ACPI_AMD_MATCH 27 27 select SND_SOC_ACPI if ACPI 28 - depends on AMD_NODE 29 28 help 30 29 This option is not user-selectable but automatically handled by 31 30 'select' statements at a higher level ··· 32 33 config SND_SOC_SOF_AMD_RENOIR 33 34 tristate "SOF support for RENOIR" 34 35 depends on SND_SOC_SOF_PCI 35 - depends on CPU_SUP_AMD 36 + depends on AMD_NODE 36 37 select SND_SOC_SOF_AMD_COMMON 37 38 help 38 39 Select this option for SOF support on AMD Renoir platform ··· 40 41 config SND_SOC_SOF_AMD_VANGOGH 41 42 tristate "SOF support for VANGOGH" 42 43 depends on SND_SOC_SOF_PCI 43 - depends on CPU_SUP_AMD 44 + depends on AMD_NODE 44 45 select SND_SOC_SOF_AMD_COMMON 45 46 help 46 47 Select this option for SOF support ··· 51 52 config SND_SOC_SOF_AMD_REMBRANDT 52 53 tristate "SOF support for REMBRANDT" 53 54 depends on SND_SOC_SOF_PCI 54 - depends on CPU_SUP_AMD 55 + depends on AMD_NODE 55 56 select SND_SOC_SOF_AMD_COMMON 56 57 help 57 58 Select this option for SOF support on AMD Rembrandt platform ··· 84 85 config SND_SOC_SOF_AMD_ACP63 85 86 tristate "SOF support for ACP6.3 platform" 86 87 depends on SND_SOC_SOF_PCI 87 - depends on CPU_SUP_AMD 88 + depends on AMD_NODE 88 89 select SND_SOC_SOF_AMD_COMMON 89 90 select SND_SOC_SOF_AMD_SOUNDWIRE_LINK_BASELINE 90 91 help ··· 96 97 config SND_SOC_SOF_AMD_ACP70 97 98 tristate "SOF support for ACP7.0 platform" 98 99 depends on SND_SOC_SOF_PCI 99 - depends on CPU_SUP_AMD 100 + depends on AMD_NODE 100 101 select SND_SOC_SOF_AMD_COMMON 101 102 help 102 103 Select this option for SOF support on