diff options
| author | Tom Rini <trini@konsulko.com> | 2019-06-10 09:41:19 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-06-10 09:41:19 -0400 |
| commit | 99e14d5249a1b46ec4a4321d6125449a8f09b549 (patch) | |
| tree | 6e5e4d72c8dbb4a542782514410c59181e0b1752 /arch/arm/mach-imx | |
| parent | eb53a18c9e903e35e8e8d52da96c33b63822881c (diff) | |
| parent | f944b15966d410fd81f6051a836f86d5263f617e (diff) | |
| download | u-boot-99e14d5249a1b46ec4a4321d6125449a8f09b549.tar.gz | |
Merge tag 'video-updates-for-2019.07-rc3' of git://git.denx.de/u-boot-video
- mxsfb DM_VIDEO conversion
- splash fix for DM_VIDEO configurations
- meson HDMI fix for boards without hdmi-supply regulator
Diffstat (limited to 'arch/arm/mach-imx')
| -rw-r--r-- | arch/arm/mach-imx/cpu.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-imx/mx7/soc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/cpu.c b/arch/arm/mach-imx/cpu.c index 6b83f92662..64a0670fcf 100644 --- a/arch/arm/mach-imx/cpu.c +++ b/arch/arm/mach-imx/cpu.c @@ -298,7 +298,7 @@ void arch_preboot_os(void) /* disable video before launching O/S */ ipuv3_fb_shutdown(); #endif -#if defined(CONFIG_VIDEO_MXS) +#if defined(CONFIG_VIDEO_MXS) && !defined(CONFIG_DM_VIDEO) lcdif_power_down(); #endif } diff --git a/arch/arm/mach-imx/mx7/soc.c b/arch/arm/mach-imx/mx7/soc.c index 7cfdff0981..4a914fca5e 100644 --- a/arch/arm/mach-imx/mx7/soc.c +++ b/arch/arm/mach-imx/mx7/soc.c @@ -369,7 +369,7 @@ void s_init(void) void reset_misc(void) { #ifndef CONFIG_SPL_BUILD -#ifdef CONFIG_VIDEO_MXS +#if defined(CONFIG_VIDEO_MXS) && !defined(CONFIG_DM_VIDEO) lcdif_power_down(); #endif #endif |