diff mbox

ASoC: hdmi-codec: select CONFIG_HDMI

Message ID 1464729159-587126-1-git-send-email-arnd@arndb.de (mailing list archive)
State Accepted
Commit 6de7df8d1b1a45a07d6ecc6b4f94179e1e68f5ec
Headers show

Commit Message

Arnd Bergmann May 31, 2016, 9:12 p.m. UTC
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>
Fixes: 09184118a8ab ("ASoC: hdmi-codec: Add hdmi-codec for external HDMI-encoders")
---
 sound/soc/codecs/Kconfig | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Comments

Jyri Sarha June 1, 2016, 6:32 a.m. UTC | #1
On 06/01/16 00:12, Arnd Bergmann wrote:
> 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>
> Fixes: 09184118a8ab ("ASoC: hdmi-codec: Add hdmi-codec for external HDMI-encoders")

Oops. I wonder how I missed that. Something in omap2plus_defconfig must
trigger the selecting of HDMI.

Acked-by: Jyri Sarha <jsarha@ti.com>


> ---
>  sound/soc/codecs/Kconfig | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
> index 4d82a58ff6b0..f3fb98f0a995 100644
> --- a/sound/soc/codecs/Kconfig
> +++ b/sound/soc/codecs/Kconfig
> @@ -483,9 +483,10 @@ config SND_SOC_DMIC
>  	tristate
>  
>  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"
>
diff mbox

Patch

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 4d82a58ff6b0..f3fb98f0a995 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -483,9 +483,10 @@  config SND_SOC_DMIC
 	tristate
 
 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"