mirror of
https://github.com/torvalds/linux
synced 2024-10-15 07:47:34 +00:00
Merge branch 'for-linus'
This commit is contained in:
commit
3ccf3ddd79
|
@ -668,7 +668,7 @@ int snd_intel_dsp_driver_probe(struct pci_dev *pci)
|
|||
return SND_INTEL_DSP_DRIVER_LEGACY;
|
||||
}
|
||||
|
||||
dev_info(&pci->dev, "DSP detected with PCI class/subclass/prog-if info 0x%06x\n", pci->class);
|
||||
dev_dbg(&pci->dev, "DSP detected with PCI class/subclass/prog-if info 0x%06x\n", pci->class);
|
||||
|
||||
/* find the configuration for the specific device */
|
||||
cfg = snd_intel_dsp_find_config(pci, config_table, ARRAY_SIZE(config_table));
|
||||
|
@ -678,12 +678,12 @@ int snd_intel_dsp_driver_probe(struct pci_dev *pci)
|
|||
if (cfg->flags & FLAG_SOF) {
|
||||
if (cfg->flags & FLAG_SOF_ONLY_IF_SOUNDWIRE &&
|
||||
snd_intel_dsp_check_soundwire(pci) > 0) {
|
||||
dev_info(&pci->dev, "SoundWire enabled on CannonLake+ platform, using SOF driver\n");
|
||||
dev_info_once(&pci->dev, "SoundWire enabled on CannonLake+ platform, using SOF driver\n");
|
||||
return SND_INTEL_DSP_DRIVER_SOF;
|
||||
}
|
||||
if (cfg->flags & FLAG_SOF_ONLY_IF_DMIC &&
|
||||
snd_intel_dsp_check_dmic(pci)) {
|
||||
dev_info(&pci->dev, "Digital mics found on Skylake+ platform, using SOF driver\n");
|
||||
dev_info_once(&pci->dev, "Digital mics found on Skylake+ platform, using SOF driver\n");
|
||||
return SND_INTEL_DSP_DRIVER_SOF;
|
||||
}
|
||||
if (!(cfg->flags & FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE))
|
||||
|
@ -694,7 +694,7 @@ int snd_intel_dsp_driver_probe(struct pci_dev *pci)
|
|||
if (cfg->flags & FLAG_SST) {
|
||||
if (cfg->flags & FLAG_SST_ONLY_IF_DMIC) {
|
||||
if (snd_intel_dsp_check_dmic(pci)) {
|
||||
dev_info(&pci->dev, "Digital mics found on Skylake+ platform, using SST driver\n");
|
||||
dev_info_once(&pci->dev, "Digital mics found on Skylake+ platform, using SST driver\n");
|
||||
return SND_INTEL_DSP_DRIVER_SST;
|
||||
}
|
||||
} else {
|
||||
|
|
Loading…
Reference in a new issue