ARM: OMAP: Combine sleep242x.S and sleep243x.S and fix error for SDR

[linux-2.6-omap-h63xx.git] / arch / arm / plat-omap / include / mach / pm.h

diff --git a/arch/arm/plat-omap/include/mach/pm.h b/arch/arm/plat-omap/include/mach/pm.h
index 713bcc9e1432d031cbd333763c892c967bd39609..5a1f3db6e698e58e8edd27c9ce8af9aea34a8002 100644 (file)
--- a/arch/arm/plat-omap/include/mach/pm.h
+++ b/arch/arm/plat-omap/include/mach/pm.h
@@ -1,5 +1,5 @@
 /*
- * linux/include/mach-omap/pm.h
+ * arch/arm/plat-omap/include/mach/pm.h
  *
  * Header file for OMAP Power Management Routines
  *
@@ -145,26 +145,23 @@ static inline void omap2_allow_sleep(void) { }
 extern void omap730_cpu_suspend(unsigned short, unsigned short);
 extern void omap1510_cpu_suspend(unsigned short, unsigned short);
 extern void omap1610_cpu_suspend(unsigned short, unsigned short);
-extern void omap242x_cpu_suspend(u32 dll_ctrl, u32 cpu_revision);
-extern void omap243x_cpu_suspend(u32 dll_ctrl, u32 cpu_revision);
+extern void omap24xx_cpu_suspend(u32 dll_ctrl, void __iomem *sdrc_dlla_ctrl,
+                                       void __iomem *sdrc_power);
 extern void omap34xx_cpu_suspend(u32 *addr, int save_state);
 extern void omap730_idle_loop_suspend(void);
 extern void omap1510_idle_loop_suspend(void);
 extern void omap1610_idle_loop_suspend(void);
-extern void omap242x_idle_loop_suspend(void);
-extern void omap243x_idle_loop_suspend(void);
+extern void omap24xx_idle_loop_suspend(void);
 
 extern unsigned int omap730_cpu_suspend_sz;
 extern unsigned int omap1510_cpu_suspend_sz;
 extern unsigned int omap1610_cpu_suspend_sz;
-extern unsigned int omap242x_cpu_suspend_sz;
-extern unsigned int omap243x_cpu_suspend_sz;
+extern unsigned int omap24xx_cpu_suspend_sz;
 extern unsigned int omap34xx_cpu_suspend_sz;
 extern unsigned int omap730_idle_loop_suspend_sz;
 extern unsigned int omap1510_idle_loop_suspend_sz;
 extern unsigned int omap1610_idle_loop_suspend_sz;
-extern unsigned int omap242x_idle_loop_suspend_sz;
-extern unsigned int omap243x_idle_loop_suspend_sz;
+extern unsigned int omap24xx_idle_loop_suspend_sz;
 extern unsigned int omap34xx_suspend_sz;
 
 #ifdef CONFIG_OMAP_SERIAL_WAKE