leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge git://git.denx.de/u-boot-video

Browse Source
This commit is contained in:
Tom Rini 2017-09-01 12:57:03 -04:00
commit 1d20170467
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/splash_source.c
View File

@ -317,6 +317,11 @@ static int splash_load_fit(struct splash_location *location, u32 bmp_load_addr)
return res; return res;
img_header = (struct image_header *)bmp_load_addr; img_header = (struct image_header *)bmp_load_addr;
if (image_get_magic(img_header) != FDT_MAGIC) {
printf("Could not find FDT magic\n");
return -EINVAL;
}
fit_size = fdt_totalsize(img_header); fit_size = fdt_totalsize(img_header);
/* Read in entire FIT */ /* Read in entire FIT */

13
drivers/video/mxc_ipuv3_fb.c
View File

@ -13,6 +13,7 @@
#include <common.h> #include <common.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <asm/arch/crm_regs.h>
#include <asm/global_data.h> #include <asm/global_data.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/list.h> #include <linux/list.h>
@ -568,8 +569,18 @@ err0:
void ipuv3_fb_shutdown(void) void ipuv3_fb_shutdown(void)
{ {
int i; struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
struct ipu_stat *stat = (struct ipu_stat *)IPU_STAT; struct ipu_stat *stat = (struct ipu_stat *)IPU_STAT;
u32 reg;
int i;
/*
* Check if IPU clock was enabled before. Won't access
* IPU registers if clock is not enabled.
*/
reg = readl(&mxc_ccm->CCGR3);
if ((reg & MXC_CCM_CCGR3_IPU1_IPU_MASK) == 0)
return;
for (i = 0; i < ARRAY_SIZE(mxcfb_info); i++) { for (i = 0; i < ARRAY_SIZE(mxcfb_info); i++) {
struct fb_info *fbi = mxcfb_info[i]; struct fb_info *fbi = mxcfb_info[i];