Skip to contentSkip to conversation

ASoC: hdmi-codec: select CONFIG_HDMI

PATCH In review Arnd Bergmann 3 participants 3 messages May 31, 2016 – Jun 2, 2016

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

Fixes 09184118a8ab ("ASoC: hdmi-codec: Add hdmi-codec for external HDMI-encoders")
---
 sound/soc/codecs/Kconfig | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
sound/soc/codecs/Kconfig +4 -3
index 4d82a58ff6b0..f3fb98f0a995 100644
@@ -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"
Signature · 1 line
2.7.0
Acked-by on v1 1/1
#1 lore raw
Quoted 7 lines · Arnd Bergmann

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'

Quoted 5 lines

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

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.

Quoted 23 lines
---
 sound/soc/codecs/Kconfig | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
sound/soc/codecs/Kconfig +4 -3
index 4d82a58ff6b0..f3fb98f0a995 100644
@@ -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"
maintainer
#2 lore raw

Applied "ASoC: hdmi-codec: select CONFIG_HDMI" to the asoc tree

In reply to Arnd Bergmann

The patch

ASoC: hdmi-codec: select CONFIG_HDMI

has been applied to the asoc tree at

git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark

Quoted 1 line

From 6de7df8d1b1a45a07d6ecc6b4f94179e1e68f5ec Mon Sep 17 00:00:00 2001

From: Arnd Bergmann <[email protected]>
Date: Tue, 31 May 2016 23:12:00 +0200
Subject: [PATCH] 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.

---
 sound/soc/codecs/Kconfig | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
sound/soc/codecs/Kconfig +4 -3
index 4d82a58ff6b0..f3fb98f0a995 100644
@@ -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"
Signature · 1 line
2.8.1