diff options
author | Takashi Iwai <tiwai@suse.de> | 2021-03-02 18:30:07 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2021-03-02 18:30:07 +0100 |
commit | 9b838a3c32d7a1edd7edeec1bc455eca76622218 (patch) | |
tree | b959299355265d21586c3782fa93f0a5a2ac068d /sound/hda/Kconfig | |
parent | a864e8f159b13babf552aff14a5fbe11abc017e4 (diff) | |
parent | ffd7e705fad695fc0abd5809ef8dc72cda7e49a6 (diff) | |
download | linux-9b838a3c32d7a1edd7edeec1bc455eca76622218.tar.bz2 |
Merge tag 'tags/sound-sdw-kconfig-fixes' into for-linus
ALSA/ASoC/SOF/SoundWire: fix Kconfig issues
In January, Intel kbuild bot and Arnd Bergmann reported multiple
issues with randconfig. This patchset builds on Arnd's suggestions to
a) expose ACPI and PCI devices in separate modules, while sof-acpi-dev
and sof-pci-dev become helpers. This will result in minor changes
required for developers/testers, i.e. modprobe snd-sof-pci will no
longer result in a probe. The SOF CI was already updated to deal with
this module dependency change and introduction of new modules.
b) Fix SOF/SoundWire/DSP_config dependencies by moving the code
required to detect SoundWire presence in ACPI tables to sound/hda.
Link: https://lore.kernel.org/r/20210302003125.1178419-1-pierre-louis.bossart@linux.intel.com
Diffstat (limited to 'sound/hda/Kconfig')
-rw-r--r-- | sound/hda/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/hda/Kconfig b/sound/hda/Kconfig index 9ed5cfa3c18c..57595f1552c9 100644 --- a/sound/hda/Kconfig +++ b/sound/hda/Kconfig @@ -44,9 +44,13 @@ config SND_INTEL_NHLT config SND_INTEL_DSP_CONFIG tristate select SND_INTEL_NHLT if ACPI + select SND_INTEL_SOUNDWIRE_ACPI if ACPI # this config should be selected only for Intel DSP platforms. # A fallback is provided so that the code compiles in all cases. +config SND_INTEL_SOUNDWIRE_ACPI + tristate + config SND_INTEL_BYT_PREFER_SOF bool "Prefer SOF driver over SST on BY/CHT platforms" depends on SND_SST_ATOM_HIFI2_PLATFORM_ACPI && SND_SOC_SOF_BAYTRAIL |