From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 31 May 2016 21:12:00 +0000 (+0200)
Subject: UPSTREAM: ASoC: hdmi-codec: select CONFIG_HDMI
X-Git-Tag: firefly_0821_release~2382
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=691d13010d71b371c7a70edd820b047697f4370a;p=firefly-linux-kernel-4.4.55.git

UPSTREAM: ASoC: hdmi-codec: select CONFIG_HDMI

SND_SOC_HDMI_CODEC can be enabled without HDMI support, leading
to a link error:

In function `hdmi_codec_hw_params':
sound/soc/codecs/hdmi-codec.c:188: undefined reference to `hdmi_audio_infoframe_init'
sound/built-in.o:(.debug_addr+0x1a5c0): undefined reference to `hdmi_audio_infoframe_init'

This changes the Kconfig file to select HDMI, as the other codec using
hdmi_audio_infoframe_init already does.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Jyri Sarha <jsarha@ti.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
(cherry picked from git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git fix/hdmi
 commit 6de7df8d1b1a45a07d6ecc6b4f94179e1e68f5ec)

Change-Id: Iddf276cef778db8cb28e5ea86dec146136887056
Signed-off-by: Chris Zhong <zyw@rock-chips.com>
---

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 3d0e5bd223c7..9b89cbf3f40a 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -465,9 +465,10 @@ config SND_SOC_ES8316
 	depends on I2C
 
 config SND_SOC_HDMI_CODEC
-       tristate
-       select SND_PCM_ELD
-       select SND_PCM_IEC958
+	tristate
+	select SND_PCM_ELD
+	select SND_PCM_IEC958
+	select HDMI
 
 config SND_SOC_ES8328
 	tristate "Everest Semi ES8328 CODEC"