From 8733549494dfa18d9317d76a8fabad8b41e6dcf6 Mon Sep 17 00:00:00 2001
From: Oliver Brown <oliver.brown@nxp.com>
Date: Mon, 29 Jan 2018 14:19:20 -0600
Subject: [PATCH] MLK-17404-4 arch: arm: Adding support for i.MX8M display

Adding Display support for splash screen.

Signed-off-by: Oliver Brown <oliver.brown@nxp.com>
---
 arch/arm/imx-common/Makefile            | 1 +
 arch/arm/imx-common/cpu.c               | 6 ++++++
 arch/arm/imx-common/video.c             | 4 ++++
 arch/arm/include/asm/imx-common/video.h | 3 +++
 4 files changed, 14 insertions(+)

diff --git a/arch/arm/imx-common/Makefile b/arch/arm/imx-common/Makefile
index ac5537d376..6a1639da31 100644
--- a/arch/arm/imx-common/Makefile
+++ b/arch/arm/imx-common/Makefile
@@ -14,6 +14,7 @@ ifeq ($(SOC),$(filter $(SOC),imx8m))
 obj-$(CONFIG_IMX_BOOTAUX) += imx_bootaux.o
 obj-$(CONFIG_SYS_I2C_MXC) += i2c-mxv7.o
 obj-$(CONFIG_SECURE_BOOT) += hab.o
+obj-$(CONFIG_IMX_VIDEO_SKIP) += video.o
 obj-y += cpu.o
 endif
 
diff --git a/arch/arm/imx-common/cpu.c b/arch/arm/imx-common/cpu.c
index 1ef0c4cdd6..e798ee6a0a 100644
--- a/arch/arm/imx-common/cpu.c
+++ b/arch/arm/imx-common/cpu.c
@@ -18,6 +18,9 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/crm_regs.h>
+#if defined(CONFIG_VIDEO_IMXDCSS)
+#include <asm/arch/video_common.h>
+#endif
 #include <imx_thermal.h>
 #include <ipu_pixfmt.h>
 #include <thermal.h>
@@ -325,6 +328,9 @@ void arch_preboot_os(void)
 #if defined(CONFIG_VIDEO_MXS)
 	lcdif_power_down();
 #endif
+#if defined(CONFIG_VIDEO_IMXDCSS)
+	imx8m_fb_disable();
+#endif
 }
 
 #ifndef CONFIG_IMX8M
diff --git a/arch/arm/imx-common/video.c b/arch/arm/imx-common/video.c
index 7eed32cdac..a582487c2e 100644
--- a/arch/arm/imx-common/video.c
+++ b/arch/arm/imx-common/video.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2016 Freescale Semiconductor, Inc.
+ * Copyright 2017-2018 NXP
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
@@ -42,6 +43,9 @@ int board_video_skip(void)
 #elif defined(CONFIG_VIDEO_IMXDPUV1)
 		ret = imxdpuv1_fb_init(&displays[i].mode, displays[i].bus,
 					displays[i].pixfmt);
+#elif defined(CONFIG_VIDEO_IMXDCSS)
+		ret = imx8m_fb_init(&displays[i].mode, displays[i].bus,
+					displays[i].pixfmt);
 #elif defined(CONFIG_VIDEO_MXS)
 		ret = mxs_lcd_panel_setup(displays[i].mode,
 					displays[i].pixfmt,
diff --git a/arch/arm/include/asm/imx-common/video.h b/arch/arm/include/asm/imx-common/video.h
index 36147fe6c6..ca626ce3d9 100644
--- a/arch/arm/include/asm/imx-common/video.h
+++ b/arch/arm/include/asm/imx-common/video.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2016 Freescale Semiconductor, Inc.
+ * Copyright 2017-2018 NXP
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
@@ -15,6 +16,8 @@
 #include <asm/arch/video_common.h>
 #elif defined(CONFIG_VIDEO_MXS)
 #include <mxsfb.h>
+#elif defined(CONFIG_VIDEO_IMXDCSS)
+#include <asm/arch/video_common.h>
 #endif
 
 struct display_info_t {
-- 
2.17.1