[ARM] Fix PXA and SA1100 suspend/resume

- Don't write the current time back to the RTC on suspend - we may
  jump over a programmed wakeup alarm.
- Restore SA1100 GPIO output state

arch/arm/mach-pxa/pm.c

@@ -12,6 +12,7 @@
  */
 
 #include <linux/errno.h>
+#include <linux/time.h>
 
 #include <asm/hardware.h>
 #include <asm/memory.h>
@@ -63,15 +64,11 @@ int pm_do_suspend(void)
 {
 	unsigned long sleep_save[SLEEP_SAVE_SIZE];
 	unsigned long checksum = 0;
+	unsigned long delta;
 	int i;
 
-	cli();
-	clf();
-
-	leds_event(led_stop);
-
 	/* preserve current time */
-	RCNR = xtime.tv_sec;
+	delta = xtime.tv_sec - RCNR;
 
 	/*
 	 * Temporary solution.  This won't be necessary once
@@ -184,16 +181,12 @@ int pm_do_suspend(void)
 	RESTORE(FFIER);
 
 	/* restore current time */
-	xtime.tv_sec = RCNR;
+	xtime.tv_sec = RCNR + delta;
 
 #ifdef DEBUG
 	printk(KERN_DEBUG "*** made it back from resume\n");
 #endif
 
-	leds_event(led_start);
-
-	sti();
-
 	return 0;
 }
 

arch/arm/mach-sa1100/pm.c

@@ -57,9 +57,11 @@ enum {	SLEEP_SAVE_SP = 0,
 int pm_do_suspend(void)
 {
 	unsigned long sleep_save[SLEEP_SAVE_SIZE];
+	unsigned long delta, gpio;
 
 	/* preserve current time */
-	RCNR = xtime.tv_sec;
+	delta = xtime.tv_sec - RCNR;
+	gpio = GPLR;
 
 	/* save vital registers */
 	SAVE(OSCR);
@@ -112,6 +114,9 @@ int pm_do_suspend(void)
 
 	RESTORE(Ser1SDCR0);
 
+	GPSR = gpio;
+	GPCR = ~gpio;
+
 	/*
 	 * Clear the peripheral sleep-hold bit.
 	 */
@@ -125,7 +130,7 @@ int pm_do_suspend(void)
 	RESTORE(OIER);
 
 	/* restore current time */
-	xtime.tv_sec = RCNR;
+	xtime.tv_sec = RCNR + delta;
 
 	return 0;
 }