omap3: pm: Use exported set_cr() instead of a custom one.
authorSantosh Shilimkar <santosh.shilimkar@ti.com>
Fri, 11 Feb 2011 15:12:11 +0000 (20:42 +0530)
committerKevin Hilman <khilman@ti.com>
Thu, 10 Mar 2011 00:15:50 +0000 (16:15 -0800)
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>
arch/arm/mach-omap2/pm34xx.c

index b9427c75f4275735d1c88ceb184519c43cb9c70a..1883a464aace467f34c08cc08c61724416916ebc 100644 (file)
@@ -311,11 +311,6 @@ static irqreturn_t prcm_interrupt_handler (int irq, void *dev_id)
        return IRQ_HANDLED;
 }
 
-static void restore_control_register(u32 val)
-{
-       __asm__ __volatile__ ("mcr p15, 0, %0, c1, c0, 0" : : "r" (val));
-}
-
 /* Function to restore the table entry that was modified for enabling MMU */
 static void restore_table_entry(void)
 {
@@ -337,7 +332,7 @@ static void restore_table_entry(void)
        control_reg_value = __raw_readl(scratchpad_address
                                        + OMAP343X_CONTROL_REG_VALUE_OFFSET);
        /* This will enable caches and prediction */
-       restore_control_register(control_reg_value);
+       set_cr(control_reg_value);
 }
 
 void omap_sram_idle(void)