Skip to content

Commit 9493d05

Browse files
committed
Revert "Merge git://git.denx.de/u-boot-video"
This reverts commit 1d20170, reversing changes made to 6aee2ab. The mxc_ipuv3_fb.c changes introduce build failures on some targets. Signed-off-by: Tom Rini <[email protected]>
1 parent 0b6e5b2 commit 9493d05

File tree

2 files changed

+1
-17
lines changed

2 files changed

+1
-17
lines changed

common/splash_source.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -317,11 +317,6 @@ static int splash_load_fit(struct splash_location *location, u32 bmp_load_addr)
317317
return res;
318318

319319
img_header = (struct image_header *)bmp_load_addr;
320-
if (image_get_magic(img_header) != FDT_MAGIC) {
321-
printf("Could not find FDT magic\n");
322-
return -EINVAL;
323-
}
324-
325320
fit_size = fdt_totalsize(img_header);
326321

327322
/* Read in entire FIT */

drivers/video/mxc_ipuv3_fb.c

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414
#include <common.h>
1515
#include <linux/errno.h>
16-
#include <asm/arch/crm_regs.h>
1716
#include <asm/global_data.h>
1817
#include <linux/string.h>
1918
#include <linux/list.h>
@@ -569,18 +568,8 @@ static int mxcfb_probe(u32 interface_pix_fmt, uint8_t disp,
569568

570569
void ipuv3_fb_shutdown(void)
571570
{
572-
struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
573-
struct ipu_stat *stat = (struct ipu_stat *)IPU_STAT;
574-
u32 reg;
575571
int i;
576-
577-
/*
578-
* Check if IPU clock was enabled before. Won't access
579-
* IPU registers if clock is not enabled.
580-
*/
581-
reg = readl(&mxc_ccm->CCGR3);
582-
if ((reg & MXC_CCM_CCGR3_IPU1_IPU_MASK) == 0)
583-
return;
572+
struct ipu_stat *stat = (struct ipu_stat *)IPU_STAT;
584573

585574
for (i = 0; i < ARRAY_SIZE(mxcfb_info); i++) {
586575
struct fb_info *fbi = mxcfb_info[i];

0 commit comments

Comments
 (0)