This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / arm / mach-sa1100 / pm.c

diff --git a/arch/arm/mach-sa1100/pm.c b/arch/arm/mach-sa1100/pm.c
index 379ea5e..7120ec5 100644 (file)
--- a/arch/arm/mach-sa1100/pm.c
+++ b/arch/arm/mach-sa1100/pm.c
@@ -45,6 +45,9 @@ extern void sa1100_cpu_resume(void);
  */
 enum { SLEEP_SAVE_SP = 0,
 
+       SLEEP_SAVE_OIER,
+       SLEEP_SAVE_OSMR0, SLEEP_SAVE_OSMR1, SLEEP_SAVE_OSMR2, SLEEP_SAVE_OSMR3,
+
        SLEEP_SAVE_GPDR, SLEEP_SAVE_GAFR,
        SLEEP_SAVE_PPDR, SLEEP_SAVE_PPSR, SLEEP_SAVE_PPAR, SLEEP_SAVE_PSDR,
 
@@ -54,7 +57,7 @@ enum {        SLEEP_SAVE_SP = 0,
 };
 
 
-static int sa11x0_pm_enter(suspend_state_t state)
+static int sa11x0_pm_enter(u32 state)
 {
        unsigned long gpio, sleep_save[SLEEP_SAVE_SIZE];
        struct timespec delta, rtc;
@@ -69,6 +72,12 @@ static int sa11x0_pm_enter(suspend_state_t state)
        gpio = GPLR;
 
        /* save vital registers */
+       SAVE(OSMR0);
+       SAVE(OSMR1);
+       SAVE(OSMR2);
+       SAVE(OSMR3);
+       SAVE(OIER);
+
        SAVE(GPDR);
        SAVE(GAFR);
 
@@ -120,6 +129,15 @@ static int sa11x0_pm_enter(suspend_state_t state)
         */
        PSSR = PSSR_PH;
 
+       RESTORE(OSMR0);
+       RESTORE(OSMR1);
+       RESTORE(OSMR2);
+       RESTORE(OSMR3);
+       RESTORE(OIER);
+
+       /* OSMR0 is the system timer: make sure OSCR is sufficiently behind */
+       OSCR = OSMR0 - LATCH;
+
        /* restore current time */
        rtc.tv_sec = RCNR;
        restore_time_delta(&delta, &rtc);
@@ -135,7 +153,7 @@ unsigned long sleep_phys_sp(void *sp)
 /*
  * Called after processes are frozen, but before we shut down devices.
  */
-static int sa11x0_pm_prepare(suspend_state_t state)
+static int sa11x0_pm_prepare(u32 state)
 {
        return 0;
 }
@@ -143,7 +161,7 @@ static int sa11x0_pm_prepare(suspend_state_t state)
 /*
  * Called after devices are re-setup, but before processes are thawed.
  */
-static int sa11x0_pm_finish(suspend_state_t state)
+static int sa11x0_pm_finish(u32 state)
 {
        return 0;
 }