diff options
| author | Ye Li <ye.li@nxp.com> | 2016-02-23 15:19:39 +0800 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2016-03-25 13:35:10 +0800 |
| commit | d6d0265b09e66c576ab4c01841166415f834a1ff (patch) | |
| tree | ed4f7d2a9fcf56ad7805443865efeae228c66134 | |
| parent | 763658d9b497e44b7411581da592ef5b522e9cc9 (diff) | |
| download | u-boot-imx-d6d0265b09e66c576ab4c01841166415f834a1ff.zip u-boot-imx-d6d0265b09e66c576ab4c01841166415f834a1ff.tar.gz u-boot-imx-d6d0265b09e66c576ab4c01841166415f834a1ff.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>
| -rw-r--r-- | arch/arm/imx-common/video.c | 8 | ||||
| -rw-r--r-- | arch/arm/include/asm/imx-common/video.h | 6 |
2 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/imx-common/video.c b/arch/arm/imx-common/video.c index 46f8a1e..bc34e12 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, 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); diff --git a/arch/arm/include/asm/imx-common/video.h b/arch/arm/include/asm/imx-common/video.h index cad5f86..0f80e3f 100644 --- a/arch/arm/include/asm/imx-common/video.h +++ b/arch/arm/include/asm/imx-common/video.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2016 Freescale Semiconductor, Inc. + * * SPDX-License-Identifier: GPL-2.0+ */ @@ -6,7 +8,11 @@ #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; |