This patchset depends on the "ASoC: Intel: Skylake: probe and Kconfig simplifications" series.
Add the same logic based on PCI class/subclass/prog-if in the HDaudio legacy probe, and add a module parameter to bypass or force the automatic detection should it ever fail.
This patchset was tested on a SKL device with the DSP disabled and a WHL device with the DSP enabled. All 6 combinations of module parameters provided the expected behavior.
The SOF driver will use exactly the same mechanism, and add a mutual exclusion with the Skylake/SST driver to avoid having 3 drivers for the same PCI ID. Two is complicated enough.
Pierre-Louis Bossart (2): ALSA: HD-Audio: SKL+: abort probe if DSP is present and Skylake driver selected ALSA: HD-Audio: SKL+: force HDaudio legacy or SKL+ driver selection
include/sound/hdaudio.h | 6 ++++ sound/pci/hda/Kconfig | 46 +++++++++++++++++++++++++++++ sound/pci/hda/hda_controller.h | 2 +- sound/pci/hda/hda_intel.c | 53 +++++++++++++++++++++++++++++----- sound/soc/intel/Kconfig | 6 ++++ sound/soc/intel/skylake/skl.c | 44 +++++++++++++++++++--------- 6 files changed, 135 insertions(+), 22 deletions(-)