diff options
author | Luotao Fu <l.fu@pengutronix.de> | 2008-09-09 04:19:43 -0400 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2008-09-09 06:13:53 -0400 |
commit | defa8c309d280915a2e7f4451f70bcbb087088a3 (patch) | |
tree | e7c6e63db7a8e4816f5b91289aaf9741033e60e8 /arch/arm/plat-mxc/include | |
parent | 8b0171fad1db5c9a5b315f4a11e65da45fbd6f21 (diff) |
i.MX3: Fix compiler warnings
Fix some base address declaration by adding a cast.
Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/plat-mxc/include')
-rw-r--r-- | arch/arm/plat-mxc/include/mach/clock.h | 2 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/mx27.h | 1 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/mx31.h | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/plat-mxc/include/mach/clock.h b/arch/arm/plat-mxc/include/mach/clock.h index 24caa2b7c91d..d21f78e78819 100644 --- a/arch/arm/plat-mxc/include/mach/clock.h +++ b/arch/arm/plat-mxc/include/mach/clock.h | |||
@@ -39,7 +39,7 @@ struct clk { | |||
39 | /* Register bit position for clock's enable/disable control. */ | 39 | /* Register bit position for clock's enable/disable control. */ |
40 | u8 enable_shift; | 40 | u8 enable_shift; |
41 | /* Register address for clock's enable/disable control. */ | 41 | /* Register address for clock's enable/disable control. */ |
42 | u32 enable_reg; | 42 | void __iomem *enable_reg; |
43 | u32 flags; | 43 | u32 flags; |
44 | /* get the current clock rate (always a fresh value) */ | 44 | /* get the current clock rate (always a fresh value) */ |
45 | unsigned long (*get_rate) (struct clk *); | 45 | unsigned long (*get_rate) (struct clk *); |
diff --git a/arch/arm/plat-mxc/include/mach/mx27.h b/arch/arm/plat-mxc/include/mach/mx27.h index 212ecc246626..a86db64744a1 100644 --- a/arch/arm/plat-mxc/include/mach/mx27.h +++ b/arch/arm/plat-mxc/include/mach/mx27.h | |||
@@ -128,6 +128,7 @@ | |||
128 | * it returns 0xDEADBEEF | 128 | * it returns 0xDEADBEEF |
129 | */ | 129 | */ |
130 | #define IO_ADDRESS(x) \ | 130 | #define IO_ADDRESS(x) \ |
131 | (void __iomem *) \ | ||
131 | (((x >= AIPI_BASE_ADDR) && (x < (AIPI_BASE_ADDR + AIPI_SIZE))) ? \ | 132 | (((x >= AIPI_BASE_ADDR) && (x < (AIPI_BASE_ADDR + AIPI_SIZE))) ? \ |
132 | AIPI_IO_ADDRESS(x) : \ | 133 | AIPI_IO_ADDRESS(x) : \ |
133 | ((x >= SAHB1_BASE_ADDR) && (x < (SAHB1_BASE_ADDR + SAHB1_SIZE))) ? \ | 134 | ((x >= SAHB1_BASE_ADDR) && (x < (SAHB1_BASE_ADDR + SAHB1_SIZE))) ? \ |
diff --git a/arch/arm/plat-mxc/include/mach/mx31.h b/arch/arm/plat-mxc/include/mach/mx31.h index a7373e4a56cb..0536f8917bc0 100644 --- a/arch/arm/plat-mxc/include/mach/mx31.h +++ b/arch/arm/plat-mxc/include/mach/mx31.h | |||
@@ -198,6 +198,7 @@ | |||
198 | * it returns 0xDEADBEEF | 198 | * it returns 0xDEADBEEF |
199 | */ | 199 | */ |
200 | #define IO_ADDRESS(x) \ | 200 | #define IO_ADDRESS(x) \ |
201 | (void __iomem *) \ | ||
201 | (((x >= IRAM_BASE_ADDR) && (x < (IRAM_BASE_ADDR + IRAM_SIZE))) ? IRAM_IO_ADDRESS(x):\ | 202 | (((x >= IRAM_BASE_ADDR) && (x < (IRAM_BASE_ADDR + IRAM_SIZE))) ? IRAM_IO_ADDRESS(x):\ |
202 | ((x >= L2CC_BASE_ADDR) && (x < (L2CC_BASE_ADDR + L2CC_SIZE))) ? L2CC_IO_ADDRESS(x):\ | 203 | ((x >= L2CC_BASE_ADDR) && (x < (L2CC_BASE_ADDR + L2CC_SIZE))) ? L2CC_IO_ADDRESS(x):\ |
203 | ((x >= AIPS1_BASE_ADDR) && (x < (AIPS1_BASE_ADDR + AIPS1_SIZE))) ? AIPS1_IO_ADDRESS(x):\ | 204 | ((x >= AIPS1_BASE_ADDR) && (x < (AIPS1_BASE_ADDR + AIPS1_SIZE))) ? AIPS1_IO_ADDRESS(x):\ |