diff options
| author | Ye Li <ye.li@nxp.com> | 2016-02-23 15:19:39 +0800 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2020-04-23 02:03:53 -0700 |
| commit | 3530e8d444d9bd52be29f8b349c7d148032bdd2f (patch) | |
| tree | 9bf0e7d847c99dd96aead2ecb34979c1a49e2d35 /arch | |
| parent | 47ae49ebe0738adfb52e9224acde1aadffcb9e33 (diff) | |
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)
(cherry picked from commit f56fdb7e6ba51eef3dd7b8c46948ecdad2e17c75)
(cherry picked from commit fe490b320c9808f3c81af061d9af8f8ce73da804)
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/include/asm/mach-imx/video.h | 8 | ||||
| -rw-r--r-- | arch/arm/mach-imx/video.c | 10 |
2 files changed, 18 insertions, 0 deletions
diff --git a/arch/arm/include/asm/mach-imx/video.h b/arch/arm/include/asm/mach-imx/video.h index d1a14ad7d34..51f21f212a8 100644 --- a/arch/arm/include/asm/mach-imx/video.h +++ b/arch/arm/include/asm/mach-imx/video.h @@ -1,10 +1,18 @@ /* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (C) 2016 Freescale Semiconductor, Inc. + * + */ #ifndef __IMX_VIDEO_H_ #define __IMX_VIDEO_H_ #include <linux/fb.h> +#if defined(CONFIG_VIDEO_IPUV3) #include <ipu_pixfmt.h> +#elif defined(CONFIG_VIDEO_MXS) +#include <mxsfb.h> +#endif struct display_info_t { int bus; diff --git a/arch/arm/mach-imx/video.c b/arch/arm/mach-imx/video.c index 1bc9b7cc7e1..177f1713497 100644 --- a/arch/arm/mach-imx/video.c +++ b/arch/arm/mach-imx/video.c @@ -1,4 +1,8 @@ // SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2016 Freescale Semiconductor, Inc. + * + */ #include <common.h> #include <env.h> @@ -44,8 +48,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); |