aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2017-11-02 07:07:04 -0400
committerMark Brown <broonie@kernel.org>2017-11-02 07:20:24 -0400
commitf7a88db6fffdd193d792de5dae7890528b995cc0 (patch)
tree24920df3c8a8c31e356cf806313a7619e0d7dbf5
parente78407fb7ed38fded024def7a76e4c91bc814080 (diff)
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: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/intel/Kconfig9
1 files changed, 5 insertions, 4 deletions
diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
index a59dda39007e..e18118209b75 100644
--- a/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
@@ -31,13 +31,14 @@ config SND_SOC_ACPI_INTEL_MATCH
31 31
32config SND_SOC_INTEL_SST_TOPLEVEL 32config SND_SOC_INTEL_SST_TOPLEVEL
33 tristate "Intel ASoC SST drivers" 33 tristate "Intel ASoC SST drivers"
34 depends on X86 34 depends on X86 || COMPILE_TEST
35 depends on DMADEVICES
35 select SND_SOC_INTEL_MACH 36 select SND_SOC_INTEL_MACH
36 select SND_SOC_INTEL_COMMON 37 select SND_SOC_INTEL_COMMON
37 38
38config SND_SOC_INTEL_HASWELL 39config SND_SOC_INTEL_HASWELL
39 tristate "Intel ASoC SST driver for Haswell/Broadwell" 40 tristate "Intel ASoC SST driver for Haswell/Broadwell"
40 depends on SND_SOC_INTEL_SST_TOPLEVEL 41 depends on SND_SOC_INTEL_SST_TOPLEVEL && SND_DMA_SGBUF
41 select SND_SOC_INTEL_SST 42 select SND_SOC_INTEL_SST
42 select SND_SOC_INTEL_SST_FIRMWARE 43 select SND_SOC_INTEL_SST_FIRMWARE
43 44
@@ -49,12 +50,12 @@ config SND_SOC_INTEL_BAYTRAIL
49 50
50config SND_SST_ATOM_HIFI2_PLATFORM 51config SND_SST_ATOM_HIFI2_PLATFORM
51 tristate "Intel ASoC SST driver for HiFi2 platforms (*field, *trail)" 52 tristate "Intel ASoC SST driver for HiFi2 platforms (*field, *trail)"
52 depends on SND_SOC_INTEL_SST_TOPLEVEL 53 depends on SND_SOC_INTEL_SST_TOPLEVEL && X86
53 select SND_SOC_COMPRESS 54 select SND_SOC_COMPRESS
54 55
55config SND_SOC_INTEL_SKYLAKE 56config SND_SOC_INTEL_SKYLAKE
56 tristate "Intel ASoC SST driver for SKL/BXT/KBL/GLK/CNL" 57 tristate "Intel ASoC SST driver for SKL/BXT/KBL/GLK/CNL"
57 depends on SND_SOC_INTEL_SST_TOPLEVEL 58 depends on SND_SOC_INTEL_SST_TOPLEVEL && PCI && ACPI
58 select SND_HDA_EXT_CORE 59 select SND_HDA_EXT_CORE
59 select SND_HDA_DSP_LOADER 60 select SND_HDA_DSP_LOADER
60 select SND_SOC_TOPOLOGY 61 select SND_SOC_TOPOLOGY