Merge branch 'topic/hda-bus-ops-cleanup' of https://git.kernel.org/pub/scm/linux...

diff --cc sound/hda/Kconfig
Simple merge

diff --cc sound/pci/hda/Kconfig
Simple merge

diff --cc sound/pci/hda/hda_intel.c
Simple merge

diff --cc sound/soc/intel/skylake/skl-messages.c
Simple merge

diff --cc sound/soc/intel/skylake/skl.c
index c847d5241672dc071d3d7af0d5f81b4b6621ade8,c6d8076dc2fdaa6780011e4f67d8344e5ddd98c8..141dbbf975acdfea4b5c8b2a2e5e1efcc613ed9f
--- 1/sound/soc/intel/skylake/skl.c
--- 2/sound/soc/intel/skylake/skl.c
+++ b/sound/soc/intel/skylake/skl.c
@@@ -858,11 -854,10 +858,10 @@@ out_err
   * constructor
   */
  static int skl_create(struct pci_dev *pci,
-                     const struct hdac_io_ops *io_ops,
 -                    struct skl **rskl)
 +                    struct skl_dev **rskl)
  {
        struct hdac_ext_bus_ops *ext_ops = NULL;
 -      struct skl *skl;
 +      struct skl_dev *skl;
        struct hdac_bus *bus;
        struct hda_bus *hbus;
        int err;

diff --cc sound/soc/sof/intel/hda-dsp.c
index fb55a3c5afd0d50cbab4dacbd55c5df1f50cf564,8d4ce5b4febdcb913f4ed708a99102812e7f4e8e..097727cda5cb3c9b13c25d20793f837d3deb6235
--- 1/sound/soc/sof/intel/hda-dsp.c
--- 2/sound/soc/sof/intel/hda-dsp.c
+++ b/sound/soc/sof/intel/hda-dsp.c
@@@ -354,11 -352,46 +354,50 @@@ static int hda_resume(struct snd_sof_de
                return ret;
        }
  
+       hda_dsp_ctrl_misc_clock_gating(sdev, false);
+ 
+       /* Reset stream-to-link mapping */
+       list_for_each_entry(hlink, &bus->hlink_list, list)
+               writel(0, hlink->ml_addr + AZX_REG_ML_LOSIDV);
+ 
+       hda_dsp_ctrl_misc_clock_gating(sdev, true);
+ #else
+ 
+       hda_dsp_ctrl_misc_clock_gating(sdev, false);
+ 
+       /* reset controller */
+       ret = hda_dsp_ctrl_link_reset(sdev, true);
+       if (ret < 0) {
+               dev_err(sdev->dev,
+                       "error: failed to reset controller during resume\n");
+               return ret;
+       }
+ 
+       /* take controller out of reset */
+       ret = hda_dsp_ctrl_link_reset(sdev, false);
+       if (ret < 0) {
+               dev_err(sdev->dev,
+                       "error: failed to ready controller during resume\n");
+               return ret;
+       }
+ 
+       /* enable hda bus irq */
+       snd_sof_dsp_update_bits(sdev, HDA_DSP_HDA_BAR, SOF_HDA_INTCTL,
+                               SOF_HDA_INT_CTRL_EN | SOF_HDA_INT_GLOBAL_EN,
+                               SOF_HDA_INT_CTRL_EN | SOF_HDA_INT_GLOBAL_EN);
+ 
+       hda_dsp_ctrl_misc_clock_gating(sdev, true);
+ #endif
+ 
+       /* enable ppcap interrupt */
+       hda_dsp_ctrl_ppcap_enable(sdev, true);
+       hda_dsp_ctrl_ppcap_int_enable(sdev, true);
+ 
  #if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)
 +      /* check jack status */
 +      if (runtime_resume)
 +              hda_codec_jack_check(sdev);
 +
        /* turn off the links that were off before suspend */
        list_for_each_entry(hlink, &bus->hlink_list, list) {
                if (!hlink->ref_count)

diff --cc sound/soc/sof/intel/hda.c
Simple merge

diff --cc sound/soc/sof/intel/hda.h
Simple merge