summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-05-17 23:34:18 +0200
committerWolfgang Denk <wd@denx.de>2010-05-17 23:34:18 +0200
commit2f05e394fccf62a4693c6b8323de725f90d1f003 (patch)
treef1f23b634411de1141469450444cf07db0c3472a
parentf2d76ae4fdde180e120ea2d29d6ef881360b3cba (diff)
downloadu-boot-imx-2f05e394fccf62a4693c6b8323de725f90d1f003.zip
u-boot-imx-2f05e394fccf62a4693c6b8323de725f90d1f003.tar.gz
u-boot-imx-2f05e394fccf62a4693c6b8323de725f90d1f003.tar.bz2
fsl_diu_fb.c: fix build warnings
Commit 15351855 "fsl-diu: Using I/O accessor to CCSR space" caused a number of "passing argument 2 of 'out_be32' makes integer from pointer without a cast" warnings; fix these. Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Dave Liu <daveliu@freescale.com> Cc: Jerry Huang <Chang-Ming.Huang@freescale.com> Cc: Kumar Gala <galak@kernel.crashing.org>
-rw-r--r--board/freescale/common/fsl_diu_fb.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/board/freescale/common/fsl_diu_fb.c b/board/freescale/common/fsl_diu_fb.c
index e7f077e..e740ad8 100644
--- a/board/freescale/common/fsl_diu_fb.c
+++ b/board/freescale/common/fsl_diu_fb.c
@@ -268,9 +268,9 @@ int fsl_diu_init(int xres,
memset(info->screen_base, 0, info->smem_len);
- out_be32(&dr.diu_reg->desc[0], &dummy_ad);
- out_be32(&dr.diu_reg->desc[1], &dummy_ad);
- out_be32(&dr.diu_reg->desc[2], &dummy_ad);
+ out_be32(&dr.diu_reg->desc[0], (int)&dummy_ad);
+ out_be32(&dr.diu_reg->desc[1], (int)&dummy_ad);
+ out_be32(&dr.diu_reg->desc[2], (int)&dummy_ad);
debug("dummy dr.diu_reg->desc[0] = 0x%x\n", dr.diu_reg->desc[0]);
debug("dummy desc[0] = 0x%x\n", hw->desc[0]);
@@ -332,8 +332,8 @@ int fsl_diu_init(int xres,
/* Program DIU registers */
- out_be32(&hw->gamma, gamma.paddr);
- out_be32(&hw->cursor, cursor.paddr);
+ out_be32(&hw->gamma, (int)gamma.paddr);
+ out_be32(&hw->cursor, (int)cursor.paddr);
out_be32(&hw->bgnd, 0x007F7F7F);
out_be32(&hw->bgnd_wb, 0); /* BGND_WB */
out_be32(&hw->disp_size, var->yres << 16 | var->xres); /* DISP SIZE */
@@ -391,8 +391,8 @@ static int fsl_diu_enable_panel(struct fb_info *info)
struct diu_ad *ad = &fsl_diu_fb_ad;
debug("Entered: enable_panel\n");
- if (in_be32(&hw->desc[0]) != (u32)ad)
- out_be32(&hw->desc[0], ad);
+ if (in_be32(&hw->desc[0]) != (unsigned)ad)
+ out_be32(&hw->desc[0], (unsigned)ad);
debug("desc[0] = 0x%x\n", hw->desc[0]);
return 0;
}
@@ -402,8 +402,8 @@ static int fsl_diu_disable_panel(struct fb_info *info)
struct diu *hw = dr.diu_reg;
debug("Entered: disable_panel\n");
- if (in_be32(&hw->desc[0]) != (u32)&dummy_ad)
- out_be32(&hw->desc[0], &dummy_ad);
+ if (in_be32(&hw->desc[0]) != (unsigned)&dummy_ad)
+ out_be32(&hw->desc[0], (unsigned)&dummy_ad);
return 0;
}