From 0b9db5070bac08e78fb3b20dac14c0fc27c0e8e0 Mon Sep 17 00:00:00 2001 From: Liu Ying Date: Fri, 22 Nov 2013 16:28:43 +0800 Subject: ENGR00289053-2 MX6 SabreSD: Disable HDMI detect As the HDMI splash screen feature is not well supported, we should not set it to be the default display. In case, users leave the 'panel' uboot environment variable empty and connect the board with a HDMI monitor, the HDMI detect funtion will work and enable the HDMI splash screen. So, this patch disables HDMI detect function so that users may only explicitly set the 'panel' variable to be 'HDMI' to use HDMI splash screen. Signed-off-by: Liu Ying (cherry picked from commit d97c525d98261ea3e83e5fbc30a7225b72dbe8a9) --- board/freescale/mx6qsabresd/mx6qsabresd.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/board/freescale/mx6qsabresd/mx6qsabresd.c b/board/freescale/mx6qsabresd/mx6qsabresd.c index 75f5d3a..1e198aa 100644 --- a/board/freescale/mx6qsabresd/mx6qsabresd.c +++ b/board/freescale/mx6qsabresd/mx6qsabresd.c @@ -829,12 +829,6 @@ struct display_info_t { struct fb_videomode mode; }; -static 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; -} - static void disable_lvds(struct display_info_t const *dev) { struct iomuxc *iomux = (struct iomuxc *)IOMUXC_BASE_ADDR; @@ -887,7 +881,7 @@ static struct display_info_t const displays[] = {{ .bus = -1, .addr = 0, .pixfmt = IPU_PIX_FMT_RGB24, - .detect = detect_hdmi, + .detect = NULL, .enable = do_enable_hdmi, .mode = { .name = "HDMI", -- cgit v1.1