summaryrefslogtreecommitdiff
path: root/arch/arm/imx-common
diff options
context:
space:
mode:
authorYe Li <ye.li@nxp.com>2016-02-23 15:19:39 +0800
committerYe Li <ye.li@nxp.com>2017-04-05 14:04:30 +0800
commit8fa188c1466e6a74536f1b46fff88bf9b08b0d78 (patch)
tree3b914123678dbbd4e7a9481a0e432a67fe4f4b33 /arch/arm/imx-common
parent65d4c96e79090ba4ac5cf6d1887e39826a580500 (diff)
downloadu-boot-imx-8fa188c1466e6a74536f1b46fff88bf9b08b0d78.zip
u-boot-imx-8fa188c1466e6a74536f1b46fff88bf9b08b0d78.tar.gz
u-boot-imx-8fa188c1466e6a74536f1b46fff88bf9b08b0d78.tar.bz2
MLK-12437-2 Video: Update the common board_video_skip to support MXS LCD
Update the board_video_skip to use CONFIG_VIDEO_MXS for LCD display support. Signed-off-by: Ye Li <ye.li@nxp.com> (cherry picked from commit d6d0265b09e66c576ab4c01841166415f834a1ff)
Diffstat (limited to 'arch/arm/imx-common')
-rw-r--r--arch/arm/imx-common/video.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/imx-common/video.c b/arch/arm/imx-common/video.c
index 549bf9d..0f61593 100644
--- a/arch/arm/imx-common/video.c
+++ b/arch/arm/imx-common/video.c
@@ -1,4 +1,6 @@
/*
+ * Copyright (C) 2016 Freescale Semiconductor, Inc.
+ *
* SPDX-License-Identifier: GPL-2.0+
*/
@@ -34,8 +36,14 @@ int board_video_skip(void)
}
if (i < display_count) {
+#if defined(CONFIG_VIDEO_IPUV3)
ret = ipuv3_fb_init(&displays[i].mode, displays[i].di ? 1 : 0,
displays[i].pixfmt);
+#elif defined(CONFIG_VIDEO_MXS)
+ ret = mxs_lcd_panel_setup(displays[i].mode,
+ displays[i].pixfmt,
+ displays[i].bus);
+#endif
if (!ret) {
if (displays[i].enable)
displays[i].enable(displays + i);