summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Green <andy.green@linaro.org>2011-04-13 11:31:57 +0100
committerAndy Green <andy.green@linaro.org>2011-04-13 11:31:57 +0100
commit26ff925f44c72d44ba4256612a9a69537eb5e69c (patch)
treecd8d92ce5cd3fb5cd534eefe27492d29187d46aa
parent3e30053c4ef0d4293fee1ba2d43f971b9d5cbb9e (diff)
omap2 sdp4430 protect hdmi with hdmi sound config
Signed-off-by: Andy Green <andy.green@linaro.org>
-rw-r--r--sound/soc/omap/sdp4430.c18
1 files changed, 18 insertions, 0 deletions
diff --git a/sound/soc/omap/sdp4430.c b/sound/soc/omap/sdp4430.c
index 06583b534ab..d9a43867f7a 100644
--- a/sound/soc/omap/sdp4430.c
+++ b/sound/soc/omap/sdp4430.c
@@ -41,6 +41,10 @@
#define SDP4430_SND_DEV_ID 0
+#ifdef CONFIG_SND_OMAP_SOC_HDMI
+#include "omap-hdmi.h"
+#endif
+
static int twl6040_power_mode;
static int mcbsp_cfg;
@@ -649,6 +653,20 @@ static struct snd_soc_dai_link sdp4430_dai[] = {
.fe_playback_channels = 2,
.no_host_mode = SND_SOC_DAI_LINK_OPT_HOST,
},
+#ifdef CONFIG_SND_OMAP_SOC_HDMI
+ {
+ .name = "hdmi",
+ .stream_name = "HDMI",
+
+ .cpu_dai_name = "hdmi-dai",
+ .platform_name = "omap-pcm-audio",
+
+ /* HDMI*/
+ .codec_dai_name = "HDMI",
+
+ .no_codec = 1,
+ },
+#endif
{
.name = "Legacy McBSP",
.stream_name = "Multimedia",