[PATCH] ASoC: SOF: Intel: Kconfig: fix SoundWire dependencies

[PATCH] ASoC: SOF: Intel: Kconfig: fix SoundWire dependencies

[Pierre-Louis Bossart]

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: cf5807f5f814f ('ASoC: SOF: Intel: SoundWire: simplify Kconfig')
Reported-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Rander Wang <rander.wang@intel.com>
Reviewed-by: Bard Liao <bard.liao@intel.com>
---
 sound/soc/sof/intel/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/soc/sof/intel/Kconfig b/sound/soc/sof/intel/Kconfig
index 4bce89b5ea40..4447f515e8b1 100644
--- a/sound/soc/sof/intel/Kconfig
+++ b/sound/soc/sof/intel/Kconfig
@@ -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.
-- 
2.25.1

Re: [PATCH] ASoC: SOF: Intel: Kconfig: fix SoundWire dependencies

[Arnd Bergmann]

On Mon, Aug 2, 2021 at 5:16 PM Pierre-Louis Bossart
<pierre-louis.bossart@linux.intel.com> wrote:
>
> 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: cf5807f5f814f ('ASoC: SOF: Intel: SoundWire: simplify Kconfig')
> Reported-by: Arnd Bergmann <arnd@arndb.de>
> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
> Reviewed-by: Rander Wang <rander.wang@intel.com>
> Reviewed-by: Bard Liao <bard.liao@intel.com>

I've had this in my randconfig tree for a couple of days without seeing
any further problems:

Tested-by: Arnd Bergmann <arnd@arndb.de>

Re: [PATCH] ASoC: SOF: Intel: Kconfig: fix SoundWire dependencies

[Mark Brown]

On Mon, 2 Aug 2021 10:16:28 -0500, Pierre-Louis Bossart wrote:
> 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.

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: SOF: Intel: Kconfig: fix SoundWire dependencies
      commit: 6b994c554ebc4c065427f510db333081cbd7228d

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark