[SRU][Eoan][PATCH 0/6] alsa/sof: let legacy hda driver and sof driver co-exist

[Hui Wang]

BugLink: http://bugs.launchpad.net/bugs/1837828

These patches are already in the unstable and focal kernel, and I
already backported them to oem-b-osp1 kernel before these patches are
merged to mainline kernel, now it is time to backport them to eoan
kernel.

[Impact]
So far, if we want the sof driver to work, we need to blacklist
snd_hda_intel.ko, but on some paltforms with nv hdmi or amd hdmi,
we need these two driver co-exist.

[Fix]
Intel sent the patches to fix this issue, it is merged to kernel-5.4.


[Test Case]
remove snd_hda_intel.ko from blacklist, the two drivers (sof and hda)
worked well.

[Regression Risk]
Low. We already tested these patches on some Dell and LENOVO machines.


Hui Wang (1):
  UBUNTU: [Config] Enable SND_HDA_INTEL_DETECT_DMIC

Pierre-Louis Bossart (5):
  ASoC: Intel: Skylake: move NHLT header to common directory
  ALSA: hda: move parts of NHLT code to new module
  ALSA: hda: intel-nhlt: handle NHLT VENDOR_DEFINED DMIC geometry
  ASoC: Intel: Skylake: use common NHLT module
  ALSA: hda/intel: stop probe if DMICS are detected on Skylake+
    platforms

 debian.master/config/annotations              |   4 +
 debian.master/config/config.common.ubuntu     |   2 +
 .../skl-nhlt.h => include/sound/intel-nhlt.h  |  51 +++++++--
 sound/hda/Kconfig                             |   5 +
 sound/hda/Makefile                            |   3 +
 sound/hda/intel-nhlt.c                        | 107 ++++++++++++++++++
 sound/pci/hda/Kconfig                         |  10 ++
 sound/pci/hda/hda_intel.c                     |  34 ++++++
 sound/soc/intel/Kconfig                       |   1 +
 sound/soc/intel/skylake/skl-nhlt.c            |  91 +--------------
 sound/soc/intel/skylake/skl-ssp-clk.c         |   1 +
 sound/soc/intel/skylake/skl-topology.c        |   1 +
 sound/soc/intel/skylake/skl.c                 |  12 +-
 sound/soc/intel/skylake/skl.h                 |   4 -
 14 files changed, 218 insertions(+), 108 deletions(-)
 rename sound/soc/intel/skylake/skl-nhlt.h => include/sound/intel-nhlt.h (65%)
 create mode 100644 sound/hda/intel-nhlt.c

-- 
2.17.1