Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-28 15:11:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: amd: acp: fix Kconfig dependencies

Browse Source 
The CONFIG_SND_SOC_AMD_MACH_COMMON has some dependencies that
are not checked by the symbols that select it:

WARNING: unmet direct dependencies detected for SND_SOC_AMD_MACH_COMMON
  Depends on [n]: SOUND [=y] && !UML && SND [=m] && SND_SOC [=m] && X86 && PCI [=y] && I2C [=n]
  Selected by [m]:
  - SND_SOC_AMD_LEGACY_MACH [=m] && SOUND [=y] && !UML && SND [=m] && SND_SOC [=m]
  - SND_SOC_AMD_SOF_MACH [=m] && SOUND [=y] && !UML && SND [=m] && SND_SOC [=m]

WARNING: unmet direct dependencies detected for SND_SOC_AMD_MACH_COMMON
  Depends on [n]: SOUND [=m] && !UML && SND [=m] && SND_SOC [=m] && X86 && PCI [=n] && I2C [=m]
  Selected by [m]:
  - SND_SOC_AMD_LEGACY_MACH [=m] && SOUND [=m] && !UML && SND [=m] && SND_SOC [=m]

Make this more consistent by adding the same checks everywhere.

Fixes: 9d8a7be88b ("ASoC: amd: acp: Add legacy sound card support for Chrome audio")
Fixes: 9f84940f50 ("ASoC: amd: acp: Add SOF audio support on Chrome board")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20211027082359.52248-1-arnd@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Arnd Bergmann 2021-10-27 10:23:46 +02:00 committed by Mark Brown
parent 4bff619222
commit 1dcc81d95b
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sound/soc/amd/acp/Kconfig
View File

@ -31,18 +31,19 @@ config SND_AMD_ASOC_RENOIR
config SND_SOC_AMD_MACH_COMMON config SND_SOC_AMD_MACH_COMMON
tristate tristate
depends on X86 && PCI && I2C
select CLK_FIXED_FCH select CLK_FIXED_FCH
select SND_SOC_RT5682_I2C select SND_SOC_RT5682_I2C
select SND_SOC_DMIC select SND_SOC_DMIC
select SND_SOC_RT1019 select SND_SOC_RT1019
select SND_SOC_MAX98357A select SND_SOC_MAX98357A
select SND_SOC_RT5682S select SND_SOC_RT5682S
depends on X86 && PCI && I2C
help help
This option enables common Machine driver module for ACP. This option enables common Machine driver module for ACP.
config SND_SOC_AMD_LEGACY_MACH config SND_SOC_AMD_LEGACY_MACH
tristate "AMD Legacy Machine Driver Support" tristate "AMD Legacy Machine Driver Support"
depends on X86 && PCI && I2C
select SND_SOC_AMD_MACH_COMMON select SND_SOC_AMD_MACH_COMMON
depends on X86 && PCI && I2C depends on X86 && PCI && I2C
help help
@ -50,6 +51,7 @@ config SND_SOC_AMD_LEGACY_MACH
config SND_SOC_AMD_SOF_MACH config SND_SOC_AMD_SOF_MACH
tristate "AMD SOF Machine Driver Support" tristate "AMD SOF Machine Driver Support"
depends on X86 && PCI && I2C
select SND_SOC_AMD_MACH_COMMON select SND_SOC_AMD_MACH_COMMON
depends on X86 && PCI && I2C depends on X86 && PCI && I2C
help help