Merge branch 'master' of git://git.denx.de/u-boot-arm

[u-boot] / arch / arm / imx-common / video.c

diff --git a/arch/arm/imx-common/video.c b/arch/arm/imx-common/video.c
index 098239a7165d9f568a52b52941353c752c5618b8..8651b80ce0672f86334b7034fe27b889d30d2080 100644 (file)
--- a/arch/arm/imx-common/video.c
+++ b/arch/arm/imx-common/video.c
@@ -6,9 +6,6 @@
 #include <asm/errno.h>
 #include <asm/imx-common/video.h>
 
-extern struct display_info_t const displays[];
-extern size_t display_count;
-
 int board_video_skip(void)
 {
        int i;
@@ -53,3 +50,13 @@ int board_video_skip(void)
 
        return 0;
 }
+
+#ifdef CONFIG_IMX_HDMI
+#include <asm/arch/mxc_hdmi.h>
+#include <asm/io.h>
+int detect_hdmi(struct display_info_t const *dev)
+{
+       struct hdmi_regs *hdmi  = (struct hdmi_regs *)HDMI_ARB_BASE_ADDR;
+       return readb(&hdmi->phy_stat0) & HDMI_DVI_STAT;
+}
+#endif