Merge remote-tracking branch 'asoc/topic/hdmi' into asoc-next

1 files changed, 6 insertions, 0 deletions

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 26ae0b5d3e16..b3afae990e39 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -88,6 +88,7 @@ config SND_SOC_ALL_CODECS
         select SND_SOC_MC13783 if MFD_MC13XXX
         select SND_SOC_ML26124 if I2C
         select SND_SOC_NAU8825 if I2C
+        select SND_SOC_HDMI_CODEC
         select SND_SOC_PCM1681 if I2C
         select SND_SOC_PCM179X_I2C if I2C
         select SND_SOC_PCM179X_SPI if SPI_MASTER
@@ -478,6 +479,11 @@ config SND_SOC_BT_SCO
 config SND_SOC_DMIC
         tristate
 
+config SND_SOC_HDMI_CODEC
+       tristate
+       select SND_PCM_ELD
+       select SND_PCM_IEC958
+
 config SND_SOC_ES8328
         tristate "Everest Semi ES8328 CODEC"