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

diff --cc include/sound/soc.h
Simple merge

diff --cc sound/soc/codecs/rt5645.c
Simple merge

diff --cc sound/soc/codecs/rt5645.h
Simple merge

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

diff --cc sound/soc/soc-core.c
Simple merge

diff --cc sound/soc/soc-dapm.c
index c0117dd5c7709b19e2a9a8a14d07c9f9d7ae15c4,a6c0ed15fc1469bc6a170969c15740de7fd09d42..89e63166b50c6aaaa4077caea8fa916304933a4c
--- 1/sound/soc/soc-dapm.c
--- 2/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@@ -2224,15 -2283,12 +2226,16 @@@ static ssize_t dapm_widget_show(struct 
        struct snd_soc_pcm_runtime *rtd = dev_get_drvdata(dev);
        int i, count = 0;
  
 +      mutex_lock(&rtd->card->dapm_mutex);
 +
        for (i = 0; i < rtd->num_codecs; i++) {
-               struct snd_soc_codec *codec = rtd->codec_dais[i]->codec;
-               count += dapm_widget_show_codec(codec, buf + count);
+               struct snd_soc_component *cmpnt = rtd->codec_dais[i]->component;
+ 
+               count += dapm_widget_show_component(cmpnt, buf + count);
        }
  
 +      mutex_unlock(&rtd->card->dapm_mutex);
 +
        return count;
  }