Merge branch 'asoc-5.4' into asoc-next

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

diff --cc include/sound/sof/dai-intel.h
Simple merge

diff --cc include/sound/sof/dai.h
Simple merge

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

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

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

diff --cc sound/pci/hda/hda_controller.h
Simple merge

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

diff --cc sound/soc/atmel/mchp-i2s-mcc.c
index ab7d5f98e759e4faf9cbd8f3595fda58f1bba9dd,9a406144b18ff1c0c697b5327ef8453f5d016795..befc2a3a05b05067a70f523ae330831817a641a9
--- 1/sound/soc/atmel/mchp-i2s-mcc.c
--- 2/sound/soc/atmel/mchp-i2s-mcc.c
+++ b/sound/soc/atmel/mchp-i2s-mcc.c
@@@ -656,27 -652,30 +652,35 @@@ static int mchp_i2s_mcc_hw_params(struc
                return 0;
        }
  
-       /* Save the number of channels to know what interrupts to enable */
-       dev->channels = channels;
- 
-       if (set_divs) {
-               bclk_rate = frame_length * params_rate(params);
-               ret = mchp_i2s_mcc_config_divs(dev, bclk_rate, &mra);
+       if (mra & MCHP_I2SMCC_MRA_SRCCLK_GCLK && !dev->gclk_use) {
+               /* set the rate */
+               ret = clk_set_rate(dev->gclk, rate);
                if (ret) {
-                       dev_err(dev->dev, "unable to configure the divisors: %d\n",
-                               ret);
+                       dev_err(dev->dev,
+                               "unable to set rate %lu to GCLK: %d\n",
+                               rate, ret);
                        return ret;
                }
+ 
+               ret = clk_prepare(dev->gclk);
+               if (ret < 0) {
+                       dev_err(dev->dev, "unable to prepare GCLK: %d\n", ret);
+                       return ret;
+               }
+               dev->gclk_use = 1;
        }
  
+       /* Save the number of channels to know what interrupts to enable */
+       dev->channels = channels;
+ 
        ret = regmap_write(dev->regmap, MCHP_I2SMCC_MRA, mra);
 -      if (ret < 0)
 +      if (ret < 0) {
 +              if (dev->gclk_use) {
 +                      clk_unprepare(dev->gclk);
 +                      dev->gclk_use = 0;
 +              }
                return ret;
 +      }
        return regmap_write(dev->regmap, MCHP_I2SMCC_MRB, mrb);
  }
  

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

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

diff --cc sound/soc/fsl/fsl_ssi.c
Simple merge

diff --cc sound/soc/intel/common/sst-ipc.c
Simple merge

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

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

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

diff --cc sound/soc/ti/davinci-i2s.c
Simple merge