Merge remote-tracking branches 'asoc/topic/dwc', 'asoc/topic/es8316', 'asoc/topic...

diff --cc sound/soc/codecs/hdmi-codec.c
index d73d2c1ed8239d166a27f23161046d92a916571e,22ed0dc88f0a1d42b541d3efa66a863fe0b35eb6,22ed0dc88f0a1d42b541d3efa66a863fe0b35eb6,22ed0dc88f0a1d42b541d3efa66a863fe0b35eb6,22ed0dc88f0a1d42b541d3efa66a863fe0b35eb6,189af068f28dd132f475f799e0ae126ae8e1a455..3abf82563408fde68c8d5398ef6cf1f7592c9b42
--- 1/sound/soc/codecs/hdmi-codec.c
--- 2/sound/soc/codecs/hdmi-codec.c
--- 3/sound/soc/codecs/hdmi-codec.c
--- 4/sound/soc/codecs/hdmi-codec.c
--- 5/sound/soc/codecs/hdmi-codec.c
--- 6/sound/soc/codecs/hdmi-codec.c
+++ b/sound/soc/codecs/hdmi-codec.c
@@@@@@@ -684,15 -686,10 -686,10 -686,10 -686,10 -684,15 +684,15 @@@@@@@ static int hdmi_codec_pcm_new(struct sn
        hcp->chmap_info->chmap = hdmi_codec_stereo_chmaps;
        hcp->chmap_idx = HDMI_CODEC_CHMAP_IDX_UNKNOWN;
      
 ----   return 0;
 ++++   /* add ELD ctl with the device number corresponding to the PCM stream */
 ++++   kctl = snd_ctl_new1(&hdmi_eld_ctl, dai->component);
 ++++   if (!kctl)
 ++++           return -ENOMEM;
 ++++ 
 ++++   return snd_ctl_add(rtd->card->snd_card, kctl);
      }
      
 -----static struct snd_soc_dai_driver hdmi_i2s_dai = {
 +++++static const struct snd_soc_dai_driver hdmi_i2s_dai = {
        .name = "i2s-hifi",
        .id = DAI_ID_I2S,
        .playback = {
@@@@@@@ -733,8 -730,10 -730,10 -730,10 -730,10 -733,8 +733,8 @@@@@@@ static int hdmi_of_xlate_dai_id(struct 
        return ret;
      }
      
 -----static struct snd_soc_codec_driver hdmi_codec = {
 +++++static const struct snd_soc_codec_driver hdmi_codec = {
        .component_driver = {
 ----           .controls               = hdmi_controls,
 ----           .num_controls           = ARRAY_SIZE(hdmi_controls),
                .dapm_widgets           = hdmi_widgets,
                .num_dapm_widgets       = ARRAY_SIZE(hdmi_widgets),
                .dapm_routes            = hdmi_routes,

diff --cc sound/soc/sh/fsi.c
Simple merge