diff options
| author | Takashi Iwai <tiwai@suse.de> | 2022-01-05 15:38:11 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2022-01-05 15:38:34 +0100 |
| commit | f81483aaeb59da530b286fe5d081e1705eb5c886 (patch) | |
| tree | a4fed750afcdf61df3a2e3c7ab4456c515651290 /sound/hda/intel-dsp-config.c | |
| parent | 08977fe8cfb7d9fe9337470eec4843081cf3a76d (diff) | |
| parent | 57f234248ff925d88caedf4019ec84e6ecb83909 (diff) | |
| download | linux-f81483aaeb59da530b286fe5d081e1705eb5c886.tar.gz | |
Merge branch 'for-next' into for-linus
Pull 5.17 materials. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/hda/intel-dsp-config.c')
| -rw-r--r-- | sound/hda/intel-dsp-config.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sound/hda/intel-dsp-config.c b/sound/hda/intel-dsp-config.c index 4208fa8a4db5..c26229ed642f 100644 --- a/sound/hda/intel-dsp-config.c +++ b/sound/hda/intel-dsp-config.c @@ -374,6 +374,14 @@ static const struct config_entry config_table[] = { .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, .device = 0x51cc, }, + { + .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, + .device = 0x51cd, + }, + { + .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, + .device = 0x54c8, + }, #endif }; @@ -403,7 +411,7 @@ static int snd_intel_dsp_check_dmic(struct pci_dev *pci) nhlt = intel_nhlt_init(&pci->dev); if (nhlt) { - if (intel_nhlt_get_dmic_geo(&pci->dev, nhlt)) + if (intel_nhlt_has_endpoint_type(nhlt, NHLT_LINK_DMIC)) ret = 1; intel_nhlt_free(nhlt); } |