Skip to content

Commit

Permalink
ASoC: Intel: fix Kconfig dependencies
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Mark Brown <[email protected]>
  • Loading branch information
arndb authored and broonie committed Nov 2, 2017
1 parent e78407f commit f7a88db
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions sound/soc/intel/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down

0 comments on commit f7a88db

Please sign in to comment.