4 files changed, 92 insertions, 0 deletions

diff --git a/arch/arm/mach-pxa/corgi.c b/arch/arm/mach-pxa/corgi.c
index d6d726036361..bf6648a83901 100644
--- a/arch/arm/mach-pxa/corgi.c
+++ b/arch/arm/mach-pxa/corgi.c
@@ -19,6 +19,7 @@
 #include <linux/fs.h>
 #include <linux/interrupt.h>
 #include <linux/mmc/host.h>
+#include <linux/pm.h>
 
 #include <asm/setup.h>
 #include <asm/memory.h>
@@ -26,6 +27,7 @@
 #include <asm/hardware.h>
 #include <asm/irq.h>
 #include <asm/io.h>
+#include <asm/system.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
@@ -310,8 +312,31 @@ static struct platform_device *devices[] __initdata = {
         &corgiled_device,
 };
 
+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);
+        arm_machine_restart('h');
+}
+
+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);
+        arm_machine_restart('h');
+}
+
 static void __init corgi_init(void)
 {
+        pm_power_off = corgi_poweroff;
+        arm_pm_restart = corgi_restart;
+
         /* setup sleep mode values */
         PWER  = 0x00000002;
         PFER  = 0x00000000;
diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c
index a042473deedd..1d516d317e89 100644
--- a/arch/arm/mach-pxa/poodle.c
+++ b/arch/arm/mach-pxa/poodle.c
@@ -18,11 +18,13 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/fb.h>
+#include <linux/pm.h>
 
 #include <asm/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
 #include <asm/setup.h>
+#include <asm/system.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
@@ -247,10 +249,25 @@ static struct platform_device *devices[] __initdata = {
         &poodle_scoop_device,
 };
 
+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');
+}
+
 static void __init poodle_init(void)
 {
         int ret = 0;
 
+        pm_power_off = poodle_poweroff;
+        arm_pm_restart = poodle_restart;
+
         /* setup sleep mode values */
         PWER  = 0x00000002;
         PFER  = 0x00000000;
diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c
index 44bcb8097c7a..eb9937f6f5cd 100644
--- a/arch/arm/mach-pxa/spitz.c
+++ b/arch/arm/mach-pxa/spitz.c
@@ -20,6 +20,7 @@
 #include <linux/fs.h>
 #include <linux/interrupt.h>
 #include <linux/mmc/host.h>
+#include <linux/pm.h>
 
 #include <asm/setup.h>
 #include <asm/memory.h>
@@ -27,6 +28,7 @@
 #include <asm/hardware.h>
 #include <asm/irq.h>
 #include <asm/io.h>
+#include <asm/system.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
@@ -432,8 +434,31 @@ static struct platform_device *devices[] __initdata = {
         &spitzled_device,
 };
 
+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);
+
+        mdelay(1000);
+        arm_machine_restart('h');
+}
+
+static void spitz_restart(char mode)
+{
+        /* Bootloader magic for a reboot */
+        if((MSC0 & 0xffff0000) == 0x7ff00000)
+                MSC0 = (MSC0 & 0xffff) | 0x7ee00000;
+
+        spitz_poweroff();
+}
+
 static void __init common_init(void)
 {
+        pm_power_off = spitz_poweroff;
+        arm_pm_restart = spitz_restart;
+
         PMCR = 0x00;
 
         /* setup sleep mode values */
diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c
index 76c0e7f0a219..afa223b9e7a2 100644
--- a/arch/arm/mach-pxa/tosa.c
+++ b/arch/arm/mach-pxa/tosa.c
@@ -19,12 +19,14 @@
 #include <linux/fs.h>
 #include <linux/interrupt.h>
 #include <linux/mmc/host.h>
+#include <linux/pm.h>
 
 #include <asm/setup.h>
 #include <asm/memory.h>
 #include <asm/mach-types.h>
 #include <asm/hardware.h>
 #include <asm/irq.h>
+#include <asm/system.h>
 #include <asm/arch/irda.h>
 #include <asm/arch/mmc.h>
 #include <asm/arch/udc.h>
@@ -266,8 +268,31 @@ static struct platform_device *devices[] __initdata = {
         &tosaled_device,
 };
 
+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);
+
+        mdelay(1000);
+        arm_machine_restart('h');
+}
+
+static void tosa_restart(char mode)
+{
+        /* Bootloader magic for a reboot */
+        if((MSC0 & 0xffff0000) == 0x7ff00000)
+                MSC0 = (MSC0 & 0xffff) | 0x7ee00000;
+
+        tosa_poweroff();
+}
+
 static void __init tosa_init(void)
 {
+        pm_power_off = tosa_poweroff;
+        arm_pm_restart = tosa_restart;
+
         pxa_gpio_mode(TOSA_GPIO_ON_RESET | GPIO_IN);
         pxa_gpio_mode(TOSA_GPIO_TC6393_INT | GPIO_IN);
         pxa_gpio_mode(TOSA_GPIO_USB_IN | GPIO_IN);