summaryrefslogtreecommitdiff
path: root/arch/arm/imx-common
diff options
context:
space:
mode:
authorYe.Li <B37916@freescale.com>2014-06-12 19:47:27 +0800
committerMax Krummenacher <max.krummenacher@toradex.com>2016-03-09 14:42:00 +0100
commit7d82ff88dd793bdfba9cc0a97b1304627ee45b87 (patch)
tree5b73f01424a264e804283727c6c968e3adea82ee /arch/arm/imx-common
parentbf7bc60d702aaba5018ac8b50e8c9e0468269ffc (diff)
ENGR00315894-81 gis: Add gis module
Add gis module, current gis is support vadc input. Add power down function to lcdif driver. Signed-off-by: Sandor Yu <R01008@freescale.com> Signed-off-by: Ye.Li <B37916@freescale.com> (cherry picked from commit a007b00dd8ef9f773dfdebef0b1deb0990281793) Conflicts: drivers/video/Makefile
Diffstat (limited to 'arch/arm/imx-common')
-rw-r--r--arch/arm/imx-common/cpu.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/imx-common/cpu.c b/arch/arm/imx-common/cpu.c
index 0a7d4766a69..e097a29c78b 100644
--- a/arch/arm/imx-common/cpu.c
+++ b/arch/arm/imx-common/cpu.c
@@ -20,6 +20,10 @@
#include <thermal.h>
#include <sata.h>
+#ifdef CONFIG_VIDEO_GIS
+#include <gis.h>
+#endif
+
#ifdef CONFIG_FSL_ESDHC
#include <fsl_esdhc.h>
#endif
@@ -237,6 +241,10 @@ void arch_preboot_os(void)
/* disable video before launching O/S */
ipuv3_fb_shutdown();
#endif
+#ifdef CONFIG_VIDEO_GIS
+ /* Entry for GIS */
+ mxc_disable_gis();
+#endif
}
void set_chipselect_size(int const cs_size)