Unverified Commit f7a88db6 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Mark Brown
Browse files

ASoC: Intel: fix Kconfig dependencies 



I ran into multiple problems during randconfig builds of the
recently changed Kconfig logic for Intel ASoC drivers:

- Building without DMADEVICES doesn't work in general
- With that dependency added, we can relax the 'depends
  on X86' again and allow compile-testing, except for
  SND_SST_ATOM_HIFI2_PLATFORM, which depends on X86
  for asm/platform_sst_audio.h
- Skylake requires SND_SOC_INTEL_SST_ACPI, so we
  have to depend on ACPI in turn
- Haswell needs SND_DMA_SGBUF for snd_sgbuf_aligned_pages()

With the new set of dependencies, I no longer get any build
failures.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent e78407fb

sound/soc/intel/Kconfig

+5 −4
Original line number Diff line number Diff line
@@ -31,13 +31,14 @@ config SND_SOC_ACPI_INTEL_MATCH 


config SND_SOC_INTEL_SST_TOPLEVEL

	tristate "Intel ASoC SST drivers"

	depends on X86

	depends on X86 || COMPILE_TEST

	depends on DMADEVICES

	select SND_SOC_INTEL_MACH

	select SND_SOC_INTEL_COMMON



config SND_SOC_INTEL_HASWELL

	tristate "Intel ASoC SST driver for Haswell/Broadwell"

	depends on SND_SOC_INTEL_SST_TOPLEVEL

	depends on SND_SOC_INTEL_SST_TOPLEVEL && SND_DMA_SGBUF

	select SND_SOC_INTEL_SST

	select SND_SOC_INTEL_SST_FIRMWARE
@@ -49,12 +50,12 @@ config SND_SOC_INTEL_BAYTRAIL 


config SND_SST_ATOM_HIFI2_PLATFORM

	tristate "Intel ASoC SST driver for HiFi2 platforms (*field, *trail)"

	depends on SND_SOC_INTEL_SST_TOPLEVEL

	depends on SND_SOC_INTEL_SST_TOPLEVEL && X86

	select SND_SOC_COMPRESS



config SND_SOC_INTEL_SKYLAKE

	tristate "Intel ASoC SST driver for SKL/BXT/KBL/GLK/CNL"

	depends on SND_SOC_INTEL_SST_TOPLEVEL

	depends on SND_SOC_INTEL_SST_TOPLEVEL && PCI && ACPI

	select SND_HDA_EXT_CORE

	select SND_HDA_DSP_LOADER

	select SND_SOC_TOPOLOGY

CRA Git | Maintained and supported by SUSTech CRA and CCSE