Merge tag 'asoc-v4.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

ASoC: Updates for v4.1

More updates for v4.1, pretty much all drivers:

 - Lots of cleanups from Lars, mainly moving things from the CODEC level
   to the card level.
 - Continuing improvements to rcar from Morimoto-san, pcm512x from
   Howard and Peter, the Intel platforms from Vinod, Jie, Jin and Han,
   and to rt5670 from Bard.
 - Support for some non-DSP Qualcomm platforms, Google's Storm
   platform, Maxmim MAX98925 CODECs and the Ingenic JZ4780 SoC.

diff --combined include/sound/soc.h
index b371aef,2afdd2e..fcb312b
--- 1/include/sound/soc.h
--- 2/include/sound/soc.h
+++ b/include/sound/soc.h
@@@ -943,6 -943,7 +943,7 @@@ struct snd_soc_dai_link 
        int be_id;      /* optional ID for machine driver BE identification */
  
        const struct snd_soc_pcm_stream *params;
+       unsigned int num_params;
  
        unsigned int dai_fmt;           /* format to set on init */
  
@@@ -1268,6 -1269,19 +1269,19 @@@ static inline struct snd_soc_dapm_conte
        return component->dapm_ptr;
  }
  
+ /**
+  * snd_soc_dapm_kcontrol_codec() - Returns the codec associated to a kcontrol
+  * @kcontrol: The kcontrol
+  *
+  * This function must only be used on DAPM contexts that are known to be part of
+  * a CODEC (e.g. in a CODEC driver). Otherwise the behavior is undefined.
+  */
+ static inline struct snd_soc_codec *snd_soc_dapm_kcontrol_codec(
+       struct snd_kcontrol *kcontrol)
+ {
+       return snd_soc_dapm_to_codec(snd_soc_dapm_kcontrol_dapm(kcontrol));
+ }
+ 
  /* codec IO */
  unsigned int snd_soc_read(struct snd_soc_codec *codec, unsigned int reg);
  int snd_soc_write(struct snd_soc_codec *codec, unsigned int reg,
@@@ -1479,7 -1493,7 +1493,7 @@@ static inline struct snd_soc_codec *snd
  }
  
  /**
 - * snd_soc_kcontrol_platform() - Returns the platform that registerd the control
 + * snd_soc_kcontrol_platform() - Returns the platform that registered the control
   * @kcontrol: The control for which to get the platform
   *
   * Note: This function will only work correctly if the control has been