Merge branch 'topic/component-platform' of https://git.kernel.org/pub/scm/linux/kerne...

diff --cc sound/soc/intel/boards/broadwell.c
Simple merge

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

diff --cc sound/soc/intel/skylake/skl-topology.c
index 17da3b58c214090a18276efb6d882e4d018c7ac8,515e4b6d1950dc40a892665a9e23e01355a44f8a..3b1dca419883b99bac94c6848f56d9ce138aa207
--- 1/sound/soc/intel/skylake/skl-topology.c
--- 2/sound/soc/intel/skylake/skl-topology.c
+++ b/sound/soc/intel/skylake/skl-topology.c
@@@ -2837,8 -2752,8 +2837,8 @@@ void skl_cleanup_resources(struct skl *
        skl->resource.mcps = 0;
  
        list_for_each_entry(w, &card->widgets, list) {
 -              if (is_skl_dsp_widget_type(w) && (w->priv != NULL))
 +              if (is_skl_dsp_widget_type(w, ctx->dev) && w->priv != NULL)
-                       skl_clear_pin_config(soc_platform, w);
+                       skl_clear_pin_config(soc_component, w);
        }
  
        skl_clear_module_cnt(ctx->dsp);
@@@ -3492,8 -3407,8 +3492,8 @@@ static int skl_tplg_create_pipe_widget_
        struct skl_pipe_module *p_module = NULL;
        struct skl_pipe *pipe;
  
-       list_for_each_entry(w, &platform->component.card->widgets, list) {
-               if (is_skl_dsp_widget_type(w, platform->dev) && w->priv) {
+       list_for_each_entry(w, &component->card->widgets, list) {
 -              if (is_skl_dsp_widget_type(w) && w->priv != NULL) {
++              if (is_skl_dsp_widget_type(w, component->dev) && w->priv) {
                        mcfg = w->priv;
                        pipe = mcfg->pipe;
  

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