4 files changed, 35 insertions, 4 deletions

diff --git a/arch/arm/mach-s3c2410/Kconfig b/arch/arm/mach-s3c2410/Kconfig
index e50a73f93d3d..df37594c30f8 100644
--- a/arch/arm/mach-s3c2410/Kconfig
+++ b/arch/arm/mach-s3c2410/Kconfig
@@ -292,7 +292,7 @@ config S3C2410_PM_CHECK_CHUNKSIZE
 
 config PM_SIMTEC
         bool
-        depends on PM && (ARCH_BAST || MACH_VR1000)
+        depends on PM && (ARCH_BAST || MACH_VR1000 || MACH_AML_M5900)
         default y
 
 config S3C2410_LOWLEVEL_UART_PORT
diff --git a/arch/arm/mach-s3c2410/mach-amlm5900.c b/arch/arm/mach-s3c2410/mach-amlm5900.c
index 0c9b7dafbe90..ba5109af40b4 100644
--- a/arch/arm/mach-s3c2410/mach-amlm5900.c
+++ b/arch/arm/mach-s3c2410/mach-amlm5900.c
@@ -225,13 +225,34 @@ static struct s3c2410fb_mach_info __initdata amlm5900_lcd_info = {
 };
 #endif
 
-static void __init amlm5900_init(void)
+static irqreturn_t
+amlm5900_wake_interrupt(int irq, void *ignored, struct pt_regs *regs)
 {
+        return IRQ_HANDLED;
+}
 
+static void amlm5900_init_pm(void)
+{
+        int ret = 0;
+
+        ret = request_irq(IRQ_EINT9, &amlm5900_wake_interrupt,
+                                IRQF_TRIGGER_RISING | IRQF_SHARED,
+                                "amlm5900_wakeup", &amlm5900_wake_interrupt);
+        if (ret != 0) {
+                printk(KERN_ERR "AML-M5900: no wakeup irq, %d?\n", ret);
+        } else {
+                enable_irq_wake(IRQ_EINT9);
+                /* configure the suspend/resume status pin */
+                s3c2410_gpio_cfgpin(S3C2410_GPF2, S3C2410_GPF2_OUTP);
+                s3c2410_gpio_pullup(S3C2410_GPF2, 0);
+        }
+}
+static void __init amlm5900_init(void)
+{
+        amlm5900_init_pm();
 #ifdef CONFIG_FB_S3C2410
         s3c24xx_fb_set_platdata(&amlm5900_lcd_info);
 #endif
-
 }
 
 MACHINE_START(AML_M5900, "AML_M5900")
diff --git a/arch/arm/mach-s3c2410/pm-simtec.c b/arch/arm/mach-s3c2410/pm-simtec.c
index 7b244566a436..42cd05e298f8 100644
--- a/arch/arm/mach-s3c2410/pm-simtec.c
+++ b/arch/arm/mach-s3c2410/pm-simtec.c
@@ -49,7 +49,8 @@ static __init int pm_simtec_init(void)
         /* check which machine we are running on */
 
         if (!machine_is_bast() && !machine_is_vr1000() &&
-            !machine_is_anubis() && !machine_is_osiris())
+            !machine_is_anubis() && !machine_is_osiris() &&
+            !machine_is_aml_m5900())
                 return 0;
 
         printk(KERN_INFO "Simtec Board Power Manangement" COPYRIGHT "\n");
diff --git a/arch/arm/mach-s3c2410/s3c2410-pm.c b/arch/arm/mach-s3c2410/s3c2410-pm.c
index 3080d25a12de..e51d76669512 100644
--- a/arch/arm/mach-s3c2410/s3c2410-pm.c
+++ b/arch/arm/mach-s3c2410/s3c2410-pm.c
@@ -29,6 +29,8 @@
 #include <asm/hardware.h>
 #include <asm/io.h>
 
+#include <asm/mach-types.h>
+
 #include <asm/arch/regs-gpio.h>
 
 #include "cpu.h"
@@ -49,6 +51,10 @@ static void s3c2410_pm_prepare(void)
 
         DBG("GSTATUS3 0x%08x\n", __raw_readl(S3C2410_GSTATUS3));
         DBG("GSTATUS4 0x%08x\n", __raw_readl(S3C2410_GSTATUS4));
+
+        if ( machine_is_aml_m5900() )
+                s3c2410_gpio_setpin(S3C2410_GPF2, 1);
+
 }
 
 int s3c2410_pm_resume(struct sys_device *dev)
@@ -61,6 +67,9 @@ int s3c2410_pm_resume(struct sys_device *dev)
         tmp &= S3C2410_GSTATUS2_OFFRESET;
         __raw_writel(tmp, S3C2410_GSTATUS2);
 
+        if ( machine_is_aml_m5900() )
+                s3c2410_gpio_setpin(S3C2410_GPF2, 0);
+
         return 0;
 }