diff options
author | Ye.Li <B37916@freescale.com> | 2014-06-12 19:47:27 +0800 |
---|---|---|
committer | Ye Li <ye.li@nxp.com> | 2017-04-05 14:04:32 +0800 |
commit | a8e94954d8ccc44c41d77a5e356d6a99b3d45649 (patch) | |
tree | 928a7b851317e6609b7ed04e63e47c7e6c0aae44 /arch | |
parent | b24cce0ad3ec9f386ca7aa231d8a2db33462f092 (diff) | |
download | u-boot-imx-a8e94954d8ccc44c41d77a5e356d6a99b3d45649.zip u-boot-imx-a8e94954d8ccc44c41d77a5e356d6a99b3d45649.tar.gz u-boot-imx-a8e94954d8ccc44c41d77a5e356d6a99b3d45649.tar.bz2 |
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)
(cherry picked from commit a31dcdafb0963381e7213c59f79a340ef27ec2e2)
(cherry picked from commit 02dfe2e4af5f51d39a51542fb0e81f93faf505bc)
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/imx-common/cpu.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/imx-common/cpu.c b/arch/arm/imx-common/cpu.c index 40fe813..b409f84 100644 --- a/arch/arm/imx-common/cpu.c +++ b/arch/arm/imx-common/cpu.c @@ -2,7 +2,7 @@ * (C) Copyright 2007 * Sascha Hauer, Pengutronix * - * (C) Copyright 2009 Freescale Semiconductor, Inc. + * (C) Copyright 2009-2016 Freescale Semiconductor, Inc. * * SPDX-License-Identifier: GPL-2.0+ */ @@ -21,6 +21,10 @@ #include <thermal.h> #include <sata.h> +#ifdef CONFIG_VIDEO_GIS +#include <gis.h> +#endif + #ifdef CONFIG_FSL_ESDHC #include <fsl_esdhc.h> #endif @@ -285,6 +289,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 #if defined(CONFIG_VIDEO_MXS) lcdif_power_down(); #endif |