summaryrefslogtreecommitdiff
path: root/sound/soc/intel/Kconfig
diff options
context:
space:
mode:
authorPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>2017-10-12 18:49:45 -0500
committerMark Brown <broonie@kernel.org>2017-10-21 11:21:47 +0100
commitf6a118a800e35af2c63f90cbcc23093f4b53b3a2 (patch)
tree99a16ac7554147f1ef237116913ef871882511a4 /sound/soc/intel/Kconfig
parentd4d86b86e1ffa6be16b287ee34b0090ef79a0fbb (diff)
ASoC: Intel: clarify Kconfig dependencies
Introduce more logical dependencies, with the SOC selected first and the relevant machine drivers are exposed. The same mechanism will be used for SOF support. Also select SND_SOC_ACPI_INTEL_MATCH for all machine drivers Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Acked-by: Liam Girdwood <liam.r.girdwood@linux.intel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/intel/Kconfig')
-rw-r--r--sound/soc/intel/Kconfig25
1 files changed, 16 insertions, 9 deletions
diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
index b8ebf05469d5..1dcc9e456610 100644
--- a/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
@@ -1,7 +1,3 @@
-config SND_SST_ATOM_HIFI2_PLATFORM
- tristate
- select SND_SOC_COMPRESS
-
config SND_SST_IPC
tristate
@@ -20,9 +16,7 @@ config SND_SOC_INTEL_COMMON
config SND_SOC_INTEL_SST
tristate
- select SND_SOC_INTEL_COMMON
select SND_SOC_INTEL_SST_ACPI if ACPI
- select SND_SOC_ACPI_INTEL_MATCH if ACPI
config SND_SOC_INTEL_SST_FIRMWARE
tristate
@@ -35,18 +29,31 @@ config SND_SOC_ACPI_INTEL_MATCH
tristate
select SND_SOC_ACPI if ACPI
+config SND_SOC_INTEL_SST_TOPLEVEL
+ tristate "Intel ASoC SST drivers"
+ select SND_SOC_INTEL_MACH
+ select SND_SOC_INTEL_COMMON
+
config SND_SOC_INTEL_HASWELL
- tristate
+ tristate "Intel ASoC SST driver for Haswell/Broadwell"
+ depends on SND_SOC_INTEL_SST_TOPLEVEL
select SND_SOC_INTEL_SST
select SND_SOC_INTEL_SST_FIRMWARE
config SND_SOC_INTEL_BAYTRAIL
- tristate
+ tristate "Intel ASoC SST driver for Baytrail (legacy)"
+ depends on SND_SOC_INTEL_SST_TOPLEVEL
select SND_SOC_INTEL_SST
select SND_SOC_INTEL_SST_FIRMWARE
+config SND_SST_ATOM_HIFI2_PLATFORM
+ tristate "Intel ASoC SST driver for HiFi2 platforms (*field, *trail)"
+ depends on SND_SOC_INTEL_SST_TOPLEVEL
+ select SND_SOC_COMPRESS
+
config SND_SOC_INTEL_SKYLAKE
- tristate
+ tristate "Intel ASoC SST driver for SKL/BXT/KBL/GLK/CNL"
+ depends on SND_SOC_INTEL_SST_TOPLEVEL
select SND_HDA_EXT_CORE
select SND_HDA_DSP_LOADER
select SND_SOC_TOPOLOGY