diff options
author | Mark Brown <broonie@kernel.org> | 2018-12-13 14:36:46 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-12-13 14:36:46 +0000 |
commit | 8fe8915b6c0b5298fa547be21957b3860c39c46e (patch) | |
tree | f16772eef6506fa40fe43f53b416cd4cd4eccf6b /sound/soc/intel/boards/Kconfig | |
parent | 1b46ed96961db1a826b3e5cadac18c7c4857f054 (diff) | |
parent | a01b8d1d24451bfc00d3a975d107f9b1590bf826 (diff) | |
download | lwn-8fe8915b6c0b5298fa547be21957b3860c39c46e.tar.gz lwn-8fe8915b6c0b5298fa547be21957b3860c39c46e.zip |
Merge branch 'for-4.20' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-4.21 intel dep
Diffstat (limited to 'sound/soc/intel/boards/Kconfig')
-rw-r--r-- | sound/soc/intel/boards/Kconfig | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig index 73ca1350aa31..b177db2a0dbb 100644 --- a/sound/soc/intel/boards/Kconfig +++ b/sound/soc/intel/boards/Kconfig @@ -293,16 +293,6 @@ config SND_SOC_INTEL_KBL_DA7219_MAX98927_MACH Say Y if you have such a device. If unsure select "N". -config SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH - tristate "SKL/KBL/BXT/APL with HDA Codecs" - select SND_SOC_HDAC_HDMI - select SND_SOC_HDAC_HDA - help - This adds support for ASoC machine driver for Intel platforms - SKL/KBL/BXT/APL with iDisp, HDA audio codecs. - Say Y or m if you have such a device. This is a recommended option. - If unsure select "N". - config SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH tristate "GLK with RT5682 and MAX98357A in I2S Mode" depends on MFD_INTEL_LPSS && I2C && ACPI @@ -319,4 +309,18 @@ config SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH endif ## SND_SOC_INTEL_SKYLAKE +if SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC + +config SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH + tristate "SKL/KBL/BXT/APL with HDA Codecs" + select SND_SOC_HDAC_HDMI + # SND_SOC_HDAC_HDA is already selected + help + This adds support for ASoC machine driver for Intel platforms + SKL/KBL/BXT/APL with iDisp, HDA audio codecs. + Say Y or m if you have such a device. This is a recommended option. + If unsure select "N". + +endif ## SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC + endif ## SND_SOC_INTEL_MACH |