diff options
| author |   Jaroslav Kysela <perex@perex.cz> | 2019-10-22 19:43:12 +0200 |
|---|---|---|
| committer |   Takashi Iwai <tiwai@suse.de> | 2019-10-23 06:31:37 +0200 |
| commit | 82d9d54a6c0ee8b12211fa4e59fd940a2da4e063 (patch) | |
| tree | f2335fd53f409bf724f06c812fa68f112b418989 /sound/hda/Makefile | |
| parent | PCI: Fix missing inline for pci_pr3_present() (diff) | |
| download | linux-dev-82d9d54a6c0ee8b12211fa4e59fd940a2da4e063.tar.xz linux-dev-82d9d54a6c0ee8b12211fa4e59fd940a2da4e063.zip | |
ALSA: hda: add Intel DSP configuration / probe code
For distributions, we need one place where we can decide
which driver will be activated for the auto-configation of the
Intel's HDA hardware with DSP. Actually, we cover three drivers:
* Legacy HDA
* Intel SST
* Intel Sound Open Firmware (SOF)
All those drivers registers similar PCI IDs, so the first
driver probed from the PCI stack can win. But... it is not
guaranteed that the correct driver wins.
This commit changes Intel's NHLT ACPI module to a common
DSP probe module for the Intel's hardware. All above sound
drivers calls this code. The user can force another behaviour
using the module parameter 'dsp_driver' located in
the 'snd-intel-dspcfg' module.
This change allows to add specific dmi checks for the specific
systems. The examples are taken from the pull request:
https://github.com/thesofproject/linux/pull/927
Tested on Lenovo Carbon X1 7th gen.
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Tested-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20191022174313.29087-1-perex@perex.cz
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/hda/Makefile')
| -rw-r--r-- | sound/hda/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/hda/Makefile b/sound/hda/Makefile index 8560f6ef1b19..601e617918b8 100644 --- a/sound/hda/Makefile +++ b/sound/hda/Makefile @@ -14,5 +14,6 @@ obj-$(CONFIG_SND_HDA_CORE) += snd-hda-core.o #extended hda obj-$(CONFIG_SND_HDA_EXT_CORE) += ext/ -snd-intel-nhlt-objs := intel-nhlt.o -obj-$(CONFIG_SND_INTEL_NHLT) += snd-intel-nhlt.o +snd-intel-dspcfg-objs := intel-dsp-config.o +snd-intel-dspcfg-$(CONFIG_SND_INTEL_NHLT) += intel-nhlt.o +obj-$(CONFIG_SND_INTEL_DSP_CONFIG) += snd-intel-dspcfg.o |