From 35cfb71028db95ef469619968bbe8303e4284f23 Mon Sep 17 00:00:00 2001
From: Steven Miao <realmz6@gmail.com>
Date: Thu, 7 Jun 2012 14:17:12 +0800
Subject: [PATCH] --- yaml --- r: 313823 b: refs/heads/master c:
 923680cbee19bf7be11c3ec3ad6e5c14c4aa2194 h: refs/heads/master i:   313821:
 329b5f0a29432a03a221bae924773c68710852d3   313819:
 23ceb8e675b8a1b77262916f6388d61e6f03c361   313815:
 76d5537de694eb0762cdbba6369335356a50c205   313807:
 f380aed1737dea174c939fe9ab5d7e4b89fd8d61   313791:
 a2693bfb56b88731db6447c3d6919e74bc8f3210 v: v3

---
 [refs]                                        |  2 +-
 .../blackfin/mach-bf609/include/mach/pm.h     |  3 +++
 trunk/arch/blackfin/mach-bf609/pm.c           | 23 ++++++++++++++++++-
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 943f4f54221d..324f3ec732b5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f78028b1a1764cbd479092f568efe17a18af26f
+refs/heads/master: 923680cbee19bf7be11c3ec3ad6e5c14c4aa2194
diff --git a/trunk/arch/blackfin/mach-bf609/include/mach/pm.h b/trunk/arch/blackfin/mach-bf609/include/mach/pm.h
index 68435f9bafca..3ca0fb965636 100644
--- a/trunk/arch/blackfin/mach-bf609/include/mach/pm.h
+++ b/trunk/arch/blackfin/mach-bf609/include/mach/pm.h
@@ -18,4 +18,7 @@ extern void bf609_pm_finish(void);
 void bf609_hibernate(void);
 void bfin_sec_raise_irq(unsigned int sid);
 void coreb_enable(void);
+
+int bf609_nor_flash_init(void);
+void bf609_nor_flash_exit(void);
 #endif
diff --git a/trunk/arch/blackfin/mach-bf609/pm.c b/trunk/arch/blackfin/mach-bf609/pm.c
index 6094c7d3b1f2..4f6977762630 100644
--- a/trunk/arch/blackfin/mach-bf609/pm.c
+++ b/trunk/arch/blackfin/mach-bf609/pm.c
@@ -11,8 +11,8 @@
 #include <linux/interrupt.h>
 #include <linux/gpio.h>
 #include <linux/irq.h>
-
 #include <linux/delay.h>
+#include <linux/syscore_ops.h>
 
 #include <asm/dpmc.h>
 #include <asm/pm.h>
@@ -293,6 +293,23 @@ static struct bfin_cpu_pm_fns bf609_cpu_pm = {
 	.finish         = bf609_cpu_pm_finish,
 };
 
+#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)
+static void smc_pm_syscore_suspend(void)
+{
+	bf609_nor_flash_exit();
+}
+
+static void smc_pm_syscore_resume(void)
+{
+	bf609_nor_flash_init();
+}
+
+static struct syscore_ops smc_pm_syscore_ops = {
+	.suspend        = smc_pm_syscore_suspend,
+	.resume         = smc_pm_syscore_resume,
+};
+#endif
+
 static irqreturn_t test_isr(int irq, void *dev_id)
 {
 	printk(KERN_DEBUG "gpio irq %d\n", irq);
@@ -312,6 +329,10 @@ static int __init bf609_init_pm(void)
 	int irq;
 	int error;
 
+#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)
+	register_syscore_ops(&smc_pm_syscore_ops);
+#endif
+
 #ifdef CONFIG_PM_BFIN_WAKE_PE12
 	irq = gpio_to_irq(GPIO_PE12);
 	if (irq < 0) {