Merge tag 'asoc-hdmi-codec-improvements-v2' of git://git.kernel.org/pub/scm/linux...

Improvements to the hdmi-codec driver and ALSA infrastructure around it
to support the HDMI Channel Mapping and IEC958 controls

diff --cc sound/soc/codecs/hdmi-codec.c
index 02d2614,a67c920..e0460a9
--- 1/sound/soc/codecs/hdmi-codec.c
--- 2/sound/soc/codecs/hdmi-codec.c
+++ b/sound/soc/codecs/hdmi-codec.c
@@@ -603,10 -689,9 +708,11 @@@ static const struct snd_soc_dai_ops hdm
        .startup        = hdmi_codec_startup,
        .shutdown       = hdmi_codec_shutdown,
        .hw_params      = hdmi_codec_hw_params,
+       .prepare        = hdmi_codec_prepare,
        .set_fmt        = hdmi_codec_i2s_set_fmt,
        .mute_stream    = hdmi_codec_mute,
 +      .auto_selectable_formats        = &hdmi_codec_formats,
 +      .num_auto_selectable_formats    = 1,
  };
  
  static const struct snd_soc_dai_ops hdmi_codec_spdif_dai_ops = {