LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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)
(cherry picked from commit 8fa188c1466e6a74536f1b46fff88bf9b08b0d78)
This commit is contained in:
Ye Li 2016-02-23 15:19:39 +08:00
parent 948c5c95e8
commit f56fdb7e6b
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/include/asm/mach-imx/video.h
View File

@ -1,4 +1,6 @@
/* /*
* Copyright (C) 2016 Freescale Semiconductor, Inc.
*
* SPDX-License-Identifier: GPL-2.0+ * SPDX-License-Identifier: GPL-2.0+
*/ */
@ -6,7 +8,11 @@
#define __IMX_VIDEO_H_ #define __IMX_VIDEO_H_
#include <linux/fb.h> #include <linux/fb.h>
#if defined(CONFIG_VIDEO_IPUV3)
#include <ipu_pixfmt.h> #include <ipu_pixfmt.h>
#elif defined(CONFIG_VIDEO_MXS)
#include <mxsfb.h>
#endif
struct display_info_t { struct display_info_t {
int bus; int bus;

8
arch/arm/mach-imx/video.c
View File

@ -1,4 +1,6 @@
/* /*
* Copyright (C) 2016 Freescale Semiconductor, Inc.
*
* SPDX-License-Identifier: GPL-2.0+ * SPDX-License-Identifier: GPL-2.0+
*/ */
@ -34,8 +36,14 @@ int board_video_skip(void)
} }
if (i < display_count) { if (i < display_count) {
#if defined(CONFIG_VIDEO_IPUV3)
ret = ipuv3_fb_init(&displays[i].mode, displays[i].di ? 1 : 0, ret = ipuv3_fb_init(&displays[i].mode, displays[i].di ? 1 : 0,
displays[i].pixfmt); 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 (!ret) {
if (displays[i].enable) if (displays[i].enable)
displays[i].enable(displays + i); displays[i].enable(displays + i);