Skip to content

Commit 6b994c5

Browse files
plbossartbroonie
authored andcommitted
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: cf5807f ('ASoC: SOF: Intel: SoundWire: simplify Kconfig') Reported-by: Arnd Bergmann <[email protected]> Signed-off-by: Pierre-Louis Bossart <[email protected]> Reviewed-by: Rander Wang <[email protected]> Reviewed-by: Bard Liao <[email protected]> Tested-by: Arnd Bergmann <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 8b5d953 commit 6b994c5

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

sound/soc/sof/intel/Kconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,15 +278,15 @@ config SND_SOC_SOF_HDA
278278

279279
config SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE
280280
tristate
281+
select SOUNDWIRE_INTEL if SND_SOC_SOF_INTEL_SOUNDWIRE
282+
select SND_INTEL_SOUNDWIRE_ACPI if SND_SOC_SOF_INTEL_SOUNDWIRE
281283

282284
config SND_SOC_SOF_INTEL_SOUNDWIRE
283285
tristate "SOF support for SoundWire"
284286
default SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE
285287
depends on SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE
286288
depends on ACPI && SOUNDWIRE
287289
depends on !(SOUNDWIRE=m && SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE=y)
288-
select SOUNDWIRE_INTEL
289-
select SND_INTEL_SOUNDWIRE_ACPI
290290
help
291291
This adds support for SoundWire with Sound Open Firmware
292292
for Intel(R) platforms.

0 commit comments

Comments
 (0)