From: Mark Brown <broonie@kernel.org>
Date: Fri, 1 Sep 2017 11:12:36 +0000 (+0100)
Subject: Merge remote-tracking branches 'asoc/topic/dwc', 'asoc/topic/es8316', 'asoc/topic... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7d630ce4d635b847c4c15606738fb0f5aa777cf3;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge remote-tracking branches 'asoc/topic/dwc', 'asoc/topic/es8316', 'asoc/topic/fsi', 'asoc/topic/fsl' and 'asoc/topic/hdmi' into asoc-next
---

7d630ce4d635b847c4c15606738fb0f5aa777cf3
diff --cc sound/soc/codecs/hdmi-codec.c
index d73d2c1ed823,22ed0dc88f0a,22ed0dc88f0a,22ed0dc88f0a,22ed0dc88f0a,189af068f28d..3abf82563408
--- a/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,