From fe490b320c9808f3c81af061d9af8f8ce73da804 Mon Sep 17 00:00:00 2001
From: Ye Li <ye.li@nxp.com>
Date: Tue, 23 Feb 2016 15:19:39 +0800
Subject: [PATCH] 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)
---
 arch/arm/include/asm/mach-imx/video.h |  8 ++++++++
 arch/arm/mach-imx/video.c             | 10 ++++++++++
 2 files changed, 18 insertions(+)

diff --git a/arch/arm/include/asm/mach-imx/video.h b/arch/arm/include/asm/mach-imx/video.h
index 812e6f85e4..8dafeac5f2 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 953fe53cb4..6a84cbd85a 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 <linux/errno.h>
@@ -32,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);
-- 
2.17.1