Merge branch 'for-5.5' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie...

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

diff --cc sound/soc/codecs/max98090.c
index be1fc8a4aee9fc62d2a3754e9967a0fd4435156c,e46b6ada13b1b01af12a8a775cc4fcc8d6e95ef6..da23810f958e072da7a2b9a10099f2a1a9ac1f55
--- 1/sound/soc/codecs/max98090.c
--- 2/sound/soc/codecs/max98090.c
+++ b/sound/soc/codecs/max98090.c
@@@ -2305,17 -2114,29 +2305,31 @@@ static void max98090_pll_work(struct ma
  
        dev_info_ratelimited(component->dev, "PLL unlocked\n");
  
+       /*
+        * As the datasheet suggested, the maximum PLL lock time should be
+        * 7 msec.  The workaround resets the codec softly by toggling SHDN
+        * off and on if PLL failed to lock for 10 msec.  Notably, there is
+        * no suggested hold time for SHDN off.
+        */
+ 
        /* Toggle shutdown OFF then ON */
 +      mutex_lock(&component->card->dapm_mutex);
        snd_soc_component_update_bits(component, M98090_REG_DEVICE_SHUTDOWN,
                            M98090_SHDNN_MASK, 0);
-       msleep(10);
        snd_soc_component_update_bits(component, M98090_REG_DEVICE_SHUTDOWN,
                            M98090_SHDNN_MASK, M98090_SHDNN_MASK);
 +      mutex_unlock(&component->card->dapm_mutex);
  
-       /* Give PLL time to lock */
-       msleep(10);
+       for (i = 0; i < 10; ++i) {
+               /* Give PLL time to lock */
+               usleep_range(1000, 1200);
+ 
+               /* Check lock status */
+               pll = snd_soc_component_read32(
+                               component, M98090_REG_DEVICE_STATUS);
+               if (!(pll & M98090_ULK_MASK))
+                       break;
+       }
  }
  
  static void max98090_jack_work(struct work_struct *work)

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

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

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

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

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

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

diff --cc sound/soc/soc-topology.c
index e9b660f3116f27d549e4b1d9621bfa1c66fc6b29,b28613149b0cce2e4a2b1623091fac095808818b..f8bd406c619898f600f73662cd22363410a92c16
--- 1/sound/soc/soc-topology.c
--- 2/sound/soc/soc-topology.c
+++ b/sound/soc/soc-topology.c
@@@ -1935,11 -1933,13 +1935,13 @@@ static int soc_tplg_fe_link_create(stru
        ret = soc_tplg_dai_link_load(tplg, link, NULL);
        if (ret < 0) {
                dev_err(tplg->comp->dev, "ASoC: FE link loading failed\n");
-               kfree(link->name);
-               kfree(link->stream_name);
-               kfree(link->cpus->dai_name);
-               kfree(link);
-               return ret;
+               goto err;
+       }
+ 
 -      ret = snd_soc_add_dai_link(tplg->comp->card, link);
++      ret = snd_soc_add_pcm_runtime(tplg->comp->card, link);
+       if (ret < 0) {
+               dev_err(tplg->comp->dev, "ASoC: adding FE link failed\n");
+               goto err;
        }
  
        link->dobj.index = tplg->index;

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

diff --cc sound/soc/sof/topology.c
Simple merge