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

ASoC: SOF/Intel: fix selection of SND_INTEL_NHTL 



We should only select SND_INTEL_NHLT when ACPI is defined. This was
done for the legacy HDAudio driver but not for DSP-enabled cases,
leading to compilation errors with randconfig.

Fix by aligning on the same solution.

For the Skylake driver this is overkill since there is a top-level
dependency on ACPI, but it doesn't hurt and it's better to have
consistency.

Fixes: 68b953ae ('ASoC: SOF: Intel: hda: fixup HDaudio topology name with DMIC number')
Reported-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20190829214213.11653-1-pierre-louis.bossart@linux.intel.com


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

sound/soc/intel/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ config SND_SOC_INTEL_SKYLAKE_COMMON 
	select SND_SOC_INTEL_SST

	select SND_SOC_HDAC_HDA if SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC

	select SND_SOC_ACPI_INTEL_MATCH

	select SND_INTEL_NHLT

	select SND_INTEL_NHLT if ACPI

	help

	  If you have a Intel Skylake/Broxton/ApolloLake/KabyLake/

	  GeminiLake or CannonLake platform with the DSP enabled in the BIOS

sound/soc/sof/intel/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ config SND_SOC_SOF_HDA 
	tristate

	select SND_HDA_EXT_CORE if SND_SOC_SOF_HDA_LINK

	select SND_SOC_HDAC_HDA if SND_SOC_SOF_HDA_AUDIO_CODEC

	select SND_INTEL_NHLT

	select SND_INTEL_NHLT if ACPI

	help

	  This option is not user-selectable but automagically handled by

	  'select' statements at a higher level

CRA Git | Maintained and supported by SUSTech CRA and CCSE