aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-omap2/control.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/control.c b/arch/arm/mach-omap2/control.c
index e84e3b4bfde1..da041b4ab29c 100644
--- a/arch/arm/mach-omap2/control.c
+++ b/arch/arm/mach-omap2/control.c
@@ -280,6 +280,7 @@ void omap3_clear_scratchpad_contents(void)
280 u32 max_offset = OMAP343X_SCRATCHPAD_ROM_OFFSET; 280 u32 max_offset = OMAP343X_SCRATCHPAD_ROM_OFFSET;
281 void __iomem *v_addr; 281 void __iomem *v_addr;
282 u32 offset = 0; 282 u32 offset = 0;
283
283 v_addr = OMAP2_L4_IO_ADDRESS(OMAP343X_SCRATCHPAD_ROM); 284 v_addr = OMAP2_L4_IO_ADDRESS(OMAP343X_SCRATCHPAD_ROM);
284 if (omap3xxx_prm_clear_global_cold_reset()) { 285 if (omap3xxx_prm_clear_global_cold_reset()) {
285 for ( ; offset <= max_offset; offset += 0x4) 286 for ( ; offset <= max_offset; offset += 0x4)
@@ -464,7 +465,6 @@ void omap3_control_save_context(void)
464 control_context.csi = omap_ctrl_readl(OMAP343X_CONTROL_CSI); 465 control_context.csi = omap_ctrl_readl(OMAP343X_CONTROL_CSI);
465 control_context.padconf_sys_nirq = 466 control_context.padconf_sys_nirq =
466 omap_ctrl_readl(OMAP343X_CONTROL_PADCONF_SYSNIRQ); 467 omap_ctrl_readl(OMAP343X_CONTROL_PADCONF_SYSNIRQ);
467 return;
468} 468}
469 469
470void omap3_control_restore_context(void) 470void omap3_control_restore_context(void)
@@ -522,7 +522,6 @@ void omap3_control_restore_context(void)
522 omap_ctrl_writel(control_context.csi, OMAP343X_CONTROL_CSI); 522 omap_ctrl_writel(control_context.csi, OMAP343X_CONTROL_CSI);
523 omap_ctrl_writel(control_context.padconf_sys_nirq, 523 omap_ctrl_writel(control_context.padconf_sys_nirq,
524 OMAP343X_CONTROL_PADCONF_SYSNIRQ); 524 OMAP343X_CONTROL_PADCONF_SYSNIRQ);
525 return;
526} 525}
527 526
528void omap3630_ctrl_disable_rta(void) 527void omap3630_ctrl_disable_rta(void)