ASoC: amd: simplify soundwire dependencies for legacy stack

The CONFIG_SOUNDWIRE_AMD is a user-visible option, it should be never
selected by another driver.
So replace the extra complexity with a normal Kconfig dependency in
SND_SOC_AMD_SOUNDWIRE.

Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
Link: https://msgid.link/r/20240322112018.3063344-1-Vijendar.Mukunda@amd.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/amd/Kconfig b/sound/soc/amd/Kconfig
index fa74635cee08ea5bfc43ad589a6f579e1ca164a4..3508f5a96b751b6ff1783807dfb391d8739b38d6 100644 (file)
--- a/sound/soc/amd/Kconfig
+++ b/sound/soc/amd/Kconfig
@@ -134,15 +134,14 @@ config SND_SOC_AMD_RPL_ACP6x
 
 config SND_SOC_AMD_SOUNDWIRE_LINK_BASELINE
        tristate
-       select SOUNDWIRE_AMD if SND_SOC_AMD_SOUNDWIRE != n
        select SND_AMD_SOUNDWIRE_ACPI if ACPI
 
 config SND_SOC_AMD_SOUNDWIRE
        tristate "Support for SoundWire based AMD platforms"
        default SND_SOC_AMD_SOUNDWIRE_LINK_BASELINE
        depends on SND_SOC_AMD_SOUNDWIRE_LINK_BASELINE
-       depends on ACPI && SOUNDWIRE
-       depends on !(SOUNDWIRE=m && SND_SOC_AMD_SOUNDWIRE_LINK_BASELINE=y)
+       depends on ACPI
+       depends on SOUNDWIRE_AMD
        help
          This adds support for SoundWire for AMD platforms.
          Say Y if you want to enable SoundWire links with SOF.