diff options
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r-- | arch/arm/mach-omap2/control.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-omap2/pm34xx.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/control.c b/arch/arm/mach-omap2/control.c index 8b3c469e7bcd..d21faba3866b 100644 --- a/arch/arm/mach-omap2/control.c +++ b/arch/arm/mach-omap2/control.c | |||
@@ -215,7 +215,7 @@ void omap4_ctrl_pad_writel(u32 val, u16 offset) | |||
215 | void omap3_clear_scratchpad_contents(void) | 215 | void omap3_clear_scratchpad_contents(void) |
216 | { | 216 | { |
217 | u32 max_offset = OMAP343X_SCRATCHPAD_ROM_OFFSET; | 217 | u32 max_offset = OMAP343X_SCRATCHPAD_ROM_OFFSET; |
218 | u32 *v_addr; | 218 | void __iomem *v_addr; |
219 | u32 offset = 0; | 219 | u32 offset = 0; |
220 | v_addr = OMAP2_L4_IO_ADDRESS(OMAP343X_SCRATCHPAD_ROM); | 220 | v_addr = OMAP2_L4_IO_ADDRESS(OMAP343X_SCRATCHPAD_ROM); |
221 | if (prm_read_mod_reg(OMAP3430_GR_MOD, OMAP3_PRM_RSTST_OFFSET) & | 221 | if (prm_read_mod_reg(OMAP3430_GR_MOD, OMAP3_PRM_RSTST_OFFSET) & |
@@ -231,7 +231,7 @@ void omap3_clear_scratchpad_contents(void) | |||
231 | /* Populate the scratchpad structure with restore structure */ | 231 | /* Populate the scratchpad structure with restore structure */ |
232 | void omap3_save_scratchpad_contents(void) | 232 | void omap3_save_scratchpad_contents(void) |
233 | { | 233 | { |
234 | void * __iomem scratchpad_address; | 234 | void __iomem *scratchpad_address; |
235 | u32 arm_context_addr; | 235 | u32 arm_context_addr; |
236 | struct omap3_scratchpad scratchpad_contents; | 236 | struct omap3_scratchpad scratchpad_contents; |
237 | struct omap3_scratchpad_prcm_block prcm_block_contents; | 237 | struct omap3_scratchpad_prcm_block prcm_block_contents; |
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index d2b940c7215d..ac572aaebb0f 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c | |||
@@ -310,7 +310,7 @@ static void restore_control_register(u32 val) | |||
310 | /* Function to restore the table entry that was modified for enabling MMU */ | 310 | /* Function to restore the table entry that was modified for enabling MMU */ |
311 | static void restore_table_entry(void) | 311 | static void restore_table_entry(void) |
312 | { | 312 | { |
313 | u32 *scratchpad_address; | 313 | void __iomem *scratchpad_address; |
314 | u32 previous_value, control_reg_value; | 314 | u32 previous_value, control_reg_value; |
315 | u32 *address; | 315 | u32 *address; |
316 | 316 | ||