9 files changed, 8 insertions, 17 deletions

diff --git a/arch/arm/mach-pxa/corgi.c b/arch/arm/mach-pxa/corgi.c
index 259ca821e464..b757dd756655 100644
--- a/arch/arm/mach-pxa/corgi.c
+++ b/arch/arm/mach-pxa/corgi.c
@@ -493,8 +493,6 @@ static struct platform_device *devices[] __initdata = {
 
 static void corgi_poweroff(void)
 {
-        RCSR = RCSR_HWR | RCSR_WDR | RCSR_SMR | RCSR_GPR;
-
         if (!machine_is_corgi())
                 /* Green LED off tells the bootloader to halt */
                 reset_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_LED_GREEN);
@@ -503,8 +501,6 @@ static void corgi_poweroff(void)
 
 static void corgi_restart(char mode)
 {
-        RCSR = RCSR_HWR | RCSR_WDR | RCSR_SMR | RCSR_GPR;
-
         if (!machine_is_corgi())
                 /* Green LED on tells the bootloader to reboot */
                 set_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_LED_GREEN);
diff --git a/arch/arm/mach-pxa/pm.c b/arch/arm/mach-pxa/pm.c
index 329df2152dcd..7d4debbdcca3 100644
--- a/arch/arm/mach-pxa/pm.c
+++ b/arch/arm/mach-pxa/pm.c
@@ -46,9 +46,6 @@ int pxa_pm_enter(suspend_state_t state)
                         sleep_save_checksum += sleep_save[i];
         }
 
-        /* Clear reset status */
-        RCSR = RCSR_HWR | RCSR_WDR | RCSR_SMR | RCSR_GPR;
-
         /* *** go zzz *** */
         pxa_cpu_pm_fns->enter(state);
         cpu_init();
diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c
index ca5ac196b47b..0b30f25cff3c 100644
--- a/arch/arm/mach-pxa/poodle.c
+++ b/arch/arm/mach-pxa/poodle.c
@@ -326,13 +326,11 @@ static struct platform_device *devices[] __initdata = {
 
 static void poodle_poweroff(void)
 {
-        RCSR = RCSR_HWR | RCSR_WDR | RCSR_SMR | RCSR_GPR;
         arm_machine_restart('h');
 }
 
 static void poodle_restart(char mode)
 {
-        RCSR = RCSR_HWR | RCSR_WDR | RCSR_SMR | RCSR_GPR;
         arm_machine_restart('h');
 }
 
diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c
index 3642f81f8f0e..e5b417d14bb0 100644
--- a/arch/arm/mach-pxa/pxa25x.c
+++ b/arch/arm/mach-pxa/pxa25x.c
@@ -198,6 +198,9 @@ static void pxa25x_cpu_pm_restore(unsigned long *sleep_save)
 
 static void pxa25x_cpu_pm_enter(suspend_state_t state)
 {
+        /* Clear reset status */
+        RCSR = RCSR_HWR | RCSR_WDR | RCSR_SMR | RCSR_GPR;
+
         switch (state) {
         case PM_SUSPEND_MEM:
                 /* set resume return address */
diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c
index 505dccaa51f5..7e945836e129 100644
--- a/arch/arm/mach-pxa/pxa27x.c
+++ b/arch/arm/mach-pxa/pxa27x.c
@@ -249,6 +249,9 @@ void pxa27x_cpu_pm_enter(suspend_state_t state)
         /* Clear edge-detect status register. */
         PEDR = 0xDF12FE1B;
 
+        /* Clear reset status */
+        RCSR = RCSR_HWR | RCSR_WDR | RCSR_SMR | RCSR_GPR;
+
         switch (state) {
         case PM_SUSPEND_STANDBY:
                 pxa_cpu_standby();
diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c
index 62a02c3927c5..e7d0fcd9b43f 100644
--- a/arch/arm/mach-pxa/spitz.c
+++ b/arch/arm/mach-pxa/spitz.c
@@ -529,8 +529,6 @@ static struct platform_device *devices[] __initdata = {
 
 static void spitz_poweroff(void)
 {
-        RCSR = RCSR_HWR | RCSR_WDR | RCSR_SMR | RCSR_GPR;
-
         pxa_gpio_mode(SPITZ_GPIO_ON_RESET | GPIO_OUT);
         GPSR(SPITZ_GPIO_ON_RESET) = GPIO_bit(SPITZ_GPIO_ON_RESET);
 
diff --git a/arch/arm/mach-pxa/spitz_pm.c b/arch/arm/mach-pxa/spitz_pm.c
index 7a7f5f947cc5..23f050feb208 100644
--- a/arch/arm/mach-pxa/spitz_pm.c
+++ b/arch/arm/mach-pxa/spitz_pm.c
@@ -119,9 +119,6 @@ static void spitz_presuspend(void)
         /* nRESET_OUT Disable */
         PSLR |= PSLR_SL_ROD;
 
-        /* Clear reset status */
-        RCSR = RCSR_HWR | RCSR_WDR | RCSR_SMR | RCSR_GPR;
-
         /* Stop 3.6MHz and drive HIGH to PCMCIA and CS */
         PCFR = PCFR_GPR_EN | PCFR_OPDE;
 }
diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c
index 6458f6d371d9..c2cbd66db814 100644
--- a/arch/arm/mach-pxa/tosa.c
+++ b/arch/arm/mach-pxa/tosa.c
@@ -467,8 +467,6 @@ static struct platform_device *devices[] __initdata = {
 
 static void tosa_poweroff(void)
 {
-        RCSR = RCSR_HWR | RCSR_WDR | RCSR_SMR | RCSR_GPR;
-
         pxa_gpio_mode(TOSA_GPIO_ON_RESET | GPIO_OUT);
         GPSR(TOSA_GPIO_ON_RESET) = GPIO_bit(TOSA_GPIO_ON_RESET);
 
diff --git a/include/asm-arm/arch-pxa/system.h b/include/asm-arm/arch-pxa/system.h
index a758a719180f..9aa6c2e939e8 100644
--- a/include/asm-arm/arch-pxa/system.h
+++ b/include/asm-arm/arch-pxa/system.h
@@ -22,7 +22,8 @@ static inline void arch_idle(void)
 
 static inline void arch_reset(char mode)
 {
-        RCSR = RCSR_HWR | RCSR_WDR | RCSR_SMR | RCSR_GPR;
+        if (cpu_is_pxa2xx())
+                RCSR = RCSR_HWR | RCSR_WDR | RCSR_SMR | RCSR_GPR;
 
         if (mode == 's') {
                 /* Jump into ROM at address 0 */