summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiu Ying <Ying.Liu@freescale.com>2013-11-22 16:28:43 +0800
committerLiu Ying <Ying.Liu@freescale.com>2013-11-22 17:39:32 +0800
commit0b9db5070bac08e78fb3b20dac14c0fc27c0e8e0 (patch)
tree6abc4b932d663dba7d2d0e69700736f509d2ae45
parentb28ef7b5b7fb0bce9de6919d925b88358b77054c (diff)
downloadu-boot-imx-0b9db5070bac08e78fb3b20dac14c0fc27c0e8e0.zip
u-boot-imx-0b9db5070bac08e78fb3b20dac14c0fc27c0e8e0.tar.gz
u-boot-imx-0b9db5070bac08e78fb3b20dac14c0fc27c0e8e0.tar.bz2
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 <Ying.Liu@freescale.com> (cherry picked from commit d97c525d98261ea3e83e5fbc30a7225b72dbe8a9)
-rw-r--r--board/freescale/mx6qsabresd/mx6qsabresd.c8
1 files changed, 1 insertions, 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",