diff options
author | Santosh Shilimkar <santosh.shilimkar@ti.com> | 2011-02-11 10:12:11 -0500 |
---|---|---|
committer | Kevin Hilman <khilman@ti.com> | 2011-03-09 19:15:50 -0500 |
commit | 261bfb286eab32aa6129f48d2b2d24f20825757b (patch) | |
tree | 45e4f23bda9e8f62bb516c82e12b49745e0bf29b | |
parent | 51d070afd6f927752c76a0cc537c73737578bb93 (diff) |
omap3: pm: Use exported set_cr() instead of a custom one.
Remove the custom restore_control_register() and use the exported
set_cr() instead to set the system control register(SCTRL) value.
No functional change.
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Cc: Kevin Hilman <khilman@ti.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
-rw-r--r-- | arch/arm/mach-omap2/pm34xx.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index b9427c75f427..1883a464aace 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c | |||
@@ -311,11 +311,6 @@ static irqreturn_t prcm_interrupt_handler (int irq, void *dev_id) | |||
311 | return IRQ_HANDLED; | 311 | return IRQ_HANDLED; |
312 | } | 312 | } |
313 | 313 | ||
314 | static void restore_control_register(u32 val) | ||
315 | { | ||
316 | __asm__ __volatile__ ("mcr p15, 0, %0, c1, c0, 0" : : "r" (val)); | ||
317 | } | ||
318 | |||
319 | /* Function to restore the table entry that was modified for enabling MMU */ | 314 | /* Function to restore the table entry that was modified for enabling MMU */ |
320 | static void restore_table_entry(void) | 315 | static void restore_table_entry(void) |
321 | { | 316 | { |
@@ -337,7 +332,7 @@ static void restore_table_entry(void) | |||
337 | control_reg_value = __raw_readl(scratchpad_address | 332 | control_reg_value = __raw_readl(scratchpad_address |
338 | + OMAP343X_CONTROL_REG_VALUE_OFFSET); | 333 | + OMAP343X_CONTROL_REG_VALUE_OFFSET); |
339 | /* This will enable caches and prediction */ | 334 | /* This will enable caches and prediction */ |
340 | restore_control_register(control_reg_value); | 335 | set_cr(control_reg_value); |
341 | } | 336 | } |
342 | 337 | ||
343 | void omap_sram_idle(void) | 338 | void omap_sram_idle(void) |