Commit cf5807f5 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Takashi Iwai
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: default avatarGuennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Reviewed-by: default avatarBard Liao <bard.liao@intel.com>
Acked-by: default avatarMark Brown <broonie@kernel.org>
Acked-by: default avatarVinod Koul <vkoul@kernel.org>
Link: https://lore.kernel.org/r/20210302003125.1178419-6-pierre-louis.bossart@linux.intel.com


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 194fe0fc

sound/soc/sof/intel/Kconfig

+9 −17
Original line number Diff line number Diff line
@@ -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