ASoC: SOF: Intel: SoundWire: simplify Kconfig

The Kconfig file is way too convoluted. Track platforms where
SoundWire is supported, and add simpler conditions to make sure there
is no module/built-in issue.

The use of 'depends on' is less intuitive if a required 'depend' is
missing, but that's a small price to pay for clarity and simplicity.

Suggested-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Reviewed-by: Bard Liao <bard.liao@intel.com>
Acked-by: Mark Brown <broonie@kernel.org>
Acked-by: Vinod Koul <vkoul@kernel.org>
Link: https://lore.kernel.org/r/20210302003125.1178419-6-pierre-louis.bossart@linux.intel.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/soc/sof/intel/Kconfig b/sound/soc/sof/intel/Kconfig
index 7dcb61b..21e24a3 100644 (file)
--- a/sound/soc/sof/intel/Kconfig
+++ b/sound/soc/sof/intel/Kconfig
@@ -276,29 +276,21 @@ config SND_SOC_SOF_HDA
          This option is not user-selectable but automagically handled by
          'select' statements at a higher level.
 
-config SND_SOC_SOF_INTEL_SOUNDWIRE_LINK
-       bool "SOF support for SoundWire"
-       depends on ACPI
-       help
-         This adds support for SoundWire with Sound Open Firmware
-         for Intel(R) platforms.
-         Say Y if you want to enable SoundWire links with SOF.
-         If unsure select "N".
-
 config SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE
        tristate
-       select SND_SOC_SOF_INTEL_SOUNDWIRE if SND_SOC_SOF_INTEL_SOUNDWIRE_LINK
-       help
-         This option is not user-selectable but automagically handled by
-         'select' statements at a higher level.
 
 config SND_SOC_SOF_INTEL_SOUNDWIRE
-       tristate
-       select SOUNDWIRE
+       tristate "SOF support for SoundWire"
+       default SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE
+       depends on SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE
+       depends on ACPI && SOUNDWIRE
+       depends on !(SOUNDWIRE=m && SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE=y)
        select SOUNDWIRE_INTEL
        help
-         This option is not user-selectable but automagically handled by
-         'select' statements at a higher level.
+         This adds support for SoundWire with Sound Open Firmware
+         for Intel(R) platforms.
+         Say Y if you want to enable SoundWire links with SOF.
+         If unsure select "N".
 
 endif ## SND_SOC_SOF_INTEL_PCI