[x86] sound/soc/intel: Update configuration for 4.15

Enable SND_SOC_INTEL_SST_TOPLEVEL, SND_SOC_INTEL_HASWELL,
SND_SOC_INTEL_BAYTRAIL, SND_SST_ATOM_HIFI2_PLATFORM,
SND_SOC_INTEL_SKYLAKE as modules.  This re-enables the board
drivers that now depend on them (Closes: #892629).

Remove config for SND_SOC_INTEL_BYT_MAX98090_MACH and
SND_SOC_INTEL_BYT_RT5640_MACH, which depend on SND_SST_IPC_ACPI = n
and therefore can't be enabled together with the other drivers.
This commit is contained in:
Ben Hutchings 2018-03-12 00:06:33 +00:00
parent bdc8a76aa0
commit bc264fd9ed
2 changed files with 13 additions and 2 deletions

4
debian/changelog vendored
View File

@ -9,6 +9,10 @@ linux (4.15.4-2) UNRELEASED; urgency=medium
* aufs: gen-patch: Fix Subject generation to skip SPDX-License-Identifier
* aufs: Update support patchset to aufs4.15-20180219 (no functional change)
* debian/control: Point Vcs URLs to Salsa
* [x86] sound/soc/intel: Enable SND_SOC_INTEL_SST_TOPLEVEL,
SND_SOC_INTEL_HASWELL, SND_SOC_INTEL_BAYTRAIL, SND_SST_ATOM_HIFI2_PLATFORM,
SND_SOC_INTEL_SKYLAKE as modules; re-enable dependent board drivers
(Closes: #892629)
-- Salvatore Bonaccorso <carnil@debian.org> Tue, 20 Feb 2018 21:51:39 +0100

View File

@ -2004,14 +2004,21 @@ CONFIG_SND_SOC=m
##
CONFIG_SND_SOC_AMD_ACP=m
##
## file: sound/soc/intel/Kconfig
##
CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=m
CONFIG_SND_SOC_INTEL_HASWELL=m
CONFIG_SND_SOC_INTEL_BAYTRAIL=m
CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m
CONFIG_SND_SOC_INTEL_SKYLAKE=m
##
## file: sound/soc/intel/boards/Kconfig
##
CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m
CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH=m
# CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH is not set
CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m
CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m
CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m