Merge remote-tracking branch 'asoc/topic/intel' into asoc-next

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

diff --cc sound/soc/intel/skylake/skl-sst-utils.c
index ddcb52a,3fe939c..8dc0303
--- 1/sound/soc/intel/skylake/skl-sst-utils.c
--- 2/sound/soc/intel/skylake/skl-sst-utils.c
+++ b/sound/soc/intel/skylake/skl-sst-utils.c
@@@ -121,17 -121,12 +121,17 @@@ int snd_skl_get_module_info(struct skl_
        struct uuid_module *module;
        uuid_le *uuid_mod;
  
-       uuid_mod = (uuid_le *)uuid;
+       uuid_mod = (uuid_le *)mconfig->guid;
  
 +      if (list_empty(&ctx->uuid_list)) {
 +              dev_err(ctx->dev, "Module list is empty\n");
 +              return -EINVAL;
 +      }
 +
        list_for_each_entry(module, &ctx->uuid_list, list) {
                if (uuid_le_cmp(*uuid_mod, module->uuid) == 0) {
-                       dfw_config->module_id = module->id;
-                       dfw_config->is_loadable = module->is_loadable;
+                       mconfig->id.module_id = module->id;
+                       mconfig->is_loadable = module->is_loadable;
  
                        return 0;
                }

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