From ca57f3db93e745aa6933eff4e4e50c5c7e68dfe8 Mon Sep 17 00:00:00 2001
From: Zhaoyifeng <zyf@rock-chips.com>
Date: Fri, 20 Jul 2012 17:05:53 +0800
Subject: [PATCH] nand:add suspend and resume function.

---
 drivers/mtd/rknand/rknand_base.h    |  2 ++
 drivers/mtd/rknand/rknand_base_ko.c | 28 +++++++++++++++++++++++-----
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/drivers/mtd/rknand/rknand_base.h b/drivers/mtd/rknand/rknand_base.h
index e74761a8a323..b7fa95ab0b84 100755
--- a/drivers/mtd/rknand/rknand_base.h
+++ b/drivers/mtd/rknand/rknand_base.h
@@ -70,6 +70,8 @@ struct rknand_info {
     int emmc_clk_power_save_en;
     char *pdmaBuf;
     void (*nand_timing_config)(unsigned long AHBnKHz);
+    void (*rknand_suspend)(void);
+    void (*rknand_resume)(void);
     int reserved[20];
 };
 
diff --git a/drivers/mtd/rknand/rknand_base_ko.c b/drivers/mtd/rknand/rknand_base_ko.c
index 7043d2d68734..ea49e277ea8a 100755
--- a/drivers/mtd/rknand/rknand_base_ko.c
+++ b/drivers/mtd/rknand/rknand_base_ko.c
@@ -23,10 +23,11 @@
 //#include "api_flash.h"
 #include "rknand_base.h"
 #include <linux/clk.h>
+#include <linux/cpufreq.h>
 
 #define DRIVER_NAME	"rk29xxnand"
 
-const char rknand_base_version[] = "rknand_base.c version: 4.34 20120401";
+const char rknand_base_version[] = "rknand_base.c version: 4.38 20120717";
 #define NAND_DEBUG_LEVEL0 0
 #define NAND_DEBUG_LEVEL1 1
 #define NAND_DEBUG_LEVEL2 2
@@ -67,10 +68,23 @@ static char grknand_trac_buf[MAX_TRAC_BUFFER_SIZE];
 static char *ptrac_buf = grknand_trac_buf;
 void trac_log(long lba,int len, int mod)
 {
+	unsigned long long t;
+    unsigned long nanosec_rem;
+    t = cpu_clock(UINT_MAX);
+    nanosec_rem = do_div(t, 1000000000);
     if(mod)
-        ptrac_buf += sprintf(ptrac_buf,"W %d %d \n",lba,len);
+        ptrac_buf += sprintf(ptrac_buf,"[%5lu.%06lu] W %d %d \n",(unsigned long) t, nanosec_rem / 1000,lba,len);
     else
-        ptrac_buf += sprintf(ptrac_buf,"R %d %d \n",lba,len);
+        ptrac_buf += sprintf(ptrac_buf,"[%5lu.%06lu] R %d %d \n",(unsigned long) t, nanosec_rem / 1000,lba,len);
+}
+
+void trac_logs(char *s)
+{
+	unsigned long long t;
+    unsigned long nanosec_rem;
+    t = cpu_clock(UINT_MAX);
+    nanosec_rem = do_div(t, 1000000000);
+	ptrac_buf += sprintf(ptrac_buf,"[%5lu.%06lu] %s\n",(unsigned long) t, nanosec_rem / 1000,s);
 }
 
 static int rkNand_trac_read(char *page, char **start, off_t off, int count, int *eof,
@@ -80,7 +94,7 @@ static int rkNand_trac_read(char *page, char **start, off_t off, int count, int
 	int len;
 
 	 len = ptrac_buf - grknand_trac_buf - off;
-     printk("rkNand_trac_read: page=%x,off=%x,count=%x ,len=%x \n",(int)page,(int)off,count,len);
+     //printk("rkNand_trac_read: page=%x,off=%x,count=%x ,len=%x \n",(int)page,(int)off,count,len);
 
 	if (len < 0)
 		len = 0;
@@ -321,7 +335,7 @@ static int rknand_nand_timing_cfg(void)
         if(gpNandInfo->nand_timing_config)
         {
             nandc_clk_rate = newclk;
-            gpNandInfo->nand_timing_config( nandc_clk_rate / 1000); // KHz
+            //gpNandInfo->nand_timing_config( nandc_clk_rate / 1000); // KHz
         }
 	}
 	return 0;
@@ -493,12 +507,16 @@ exit_free:
 static int rknand_suspend(struct platform_device *pdev, pm_message_t state)
 {
     gpNandInfo->rknand.rknand_schedule_enable = 0;
+    if(gpNandInfo->rknand_suspend)
+        gpNandInfo->rknand_suspend();  
 	NAND_DEBUG(NAND_DEBUG_LEVEL0,"rknand_suspend: \n");
 	return 0;
 }
 
 static int rknand_resume(struct platform_device *pdev)
 {
+    if(gpNandInfo->rknand_resume)
+       gpNandInfo->rknand_resume();  
     gpNandInfo->rknand.rknand_schedule_enable = 1;
 	NAND_DEBUG(NAND_DEBUG_LEVEL0,"rknand_resume: \n");
 	return 0;
-- 
2.34.1