Unverified Commit 6b994c55 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: SOF: Intel: Kconfig: fix SoundWire dependencies 



The previous Kconfig cleanup added simplifications but also introduced
a new one by moving a boolean to a tristate. This leads to randconfig
problems.

This patch moves the select operations in the SOUNDWIRE_LINK_BASELINE
option. The INTEL_SOUNDWIRE config remains a tristate for backwards
compatibility with older configurations but is essentially an on/off
switch.

Fixes: cf5807f5 ('ASoC: SOF: Intel: SoundWire: simplify Kconfig')
Reported-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRander Wang <rander.wang@intel.com>
Reviewed-by: default avatarBard Liao <bard.liao@intel.com>
Tested-by: default avatarArnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20210802151628.15291-1-pierre-louis.bossart@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 8b5d9531

sound/soc/sof/intel/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -278,6 +278,8 @@ config SND_SOC_SOF_HDA 


config SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE

	tristate

	select SOUNDWIRE_INTEL if SND_SOC_SOF_INTEL_SOUNDWIRE

	select SND_INTEL_SOUNDWIRE_ACPI if SND_SOC_SOF_INTEL_SOUNDWIRE



config SND_SOC_SOF_INTEL_SOUNDWIRE

	tristate "SOF support for SoundWire"
@@ -285,8 +287,6 @@ config SND_SOC_SOF_INTEL_SOUNDWIRE 
	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

	select SND_INTEL_SOUNDWIRE_ACPI

	help

	  This adds support for SoundWire with Sound Open Firmware

	  for Intel(R) platforms.