aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/intel/Kconfig
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-03-13 15:16:26 +0700
committerMark Brown <broonie@kernel.org>2016-03-13 15:16:26 +0700
commitdf91a2100c05cec9323a222b97be918ccf53e378 (patch)
tree5902b152718a4a716848548909a1a049748b6950 /sound/soc/intel/Kconfig
parentMerge remote-tracking branch 'asoc/topic/dapm' into asoc-next (diff)
parentASoC: hdac_hdmi: Add broxton device ID (diff)
downloadlinux-dev-df91a2100c05cec9323a222b97be918ccf53e378.tar.xz
linux-dev-df91a2100c05cec9323a222b97be918ccf53e378.zip
Merge remote-tracking branch 'asoc/topic/intel' into asoc-next
Diffstat (limited to 'sound/soc/intel/Kconfig')
-rw-r--r--sound/soc/intel/Kconfig4
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
index 7d7c872c280d..b3e6c2300457 100644
--- a/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
@@ -163,6 +163,7 @@ config SND_SOC_INTEL_SKYLAKE
tristate
select SND_HDA_EXT_CORE
select SND_SOC_TOPOLOGY
+ select SND_HDA_I915
select SND_SOC_INTEL_SST
config SND_SOC_INTEL_SKL_RT286_MACH
@@ -172,6 +173,7 @@ config SND_SOC_INTEL_SKL_RT286_MACH
select SND_SOC_INTEL_SKYLAKE
select SND_SOC_RT286
select SND_SOC_DMIC
+ select SND_SOC_HDAC_HDMI
help
This adds support for ASoC machine driver for Skylake platforms
with RT286 I2S audio codec.
@@ -186,6 +188,7 @@ config SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH
select SND_SOC_NAU8825
select SND_SOC_SSM4567
select SND_SOC_DMIC
+ select SND_SOC_HDAC_HDMI
help
This adds support for ASoC Onboard Codec I2S machine driver. This will
create an alsa sound card for NAU88L25 + SSM4567.
@@ -200,6 +203,7 @@ config SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH
select SND_SOC_NAU8825
select SND_SOC_MAX98357A
select SND_SOC_DMIC
+ select SND_SOC_HDAC_HDMI
help
This adds support for ASoC Onboard Codec I2S machine driver. This will
create an alsa sound card for NAU88L25 + MAX98357A.