diff options
| -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 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); diff --git a/arch/arm/include/asm/imx-common/video.h b/arch/arm/include/asm/imx-common/video.h index 941a031..92b164a 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; |