X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=target%2Flinux%2Fxburst%2Ffiles-2.6.32%2Farch%2Fmips%2Fjz4740%2Fpm.c;h=e7e463ef3deacb25e7bd983009981a5ef2a1cfbc;hp=d19bb81f08981563f8048a737117c22235361d7b;hb=1f41b77a484fe5d081c83cab5c091b17525d2532;hpb=fff03d195b96ffa497cb020949998dadf8ba0b19

diff --git a/target/linux/xburst/files-2.6.32/arch/mips/jz4740/pm.c b/target/linux/xburst/files-2.6.32/arch/mips/jz4740/pm.c
index d19bb81f08..e7e463ef3d 100644
--- a/target/linux/xburst/files-2.6.32/arch/mips/jz4740/pm.c
+++ b/target/linux/xburst/files-2.6.32/arch/mips/jz4740/pm.c
@@ -18,44 +18,32 @@
 #include <linux/delay.h>
 #include <linux/suspend.h>
 #include <asm/mach-jz4740/regs.h>
+#include <asm/mach-jz4740/clock.h>
+
+#include "clock.h"
 
 extern void jz4740_intc_suspend(void);
 extern void jz4740_intc_resume(void);
+extern void jz_gpio_suspend(void);
+extern void jz_gpio_resume(void);
 
 static int jz_pm_enter(suspend_state_t state)
 {
-	unsigned long nfcsr = REG_EMC_NFCSR;
-	uint32_t scr = REG_CPM_SCR;
-
-	/* Disable nand flash */
-	REG_EMC_NFCSR = ~0xff;
-
- 	udelay(100);
-
-	/*stop udc and usb*/
-	REG_CPM_SCR &= ~( 1<<6 | 1<<7);
-	REG_CPM_SCR |= 0<<6 | 1<<7;
-
+	jz_gpio_suspend();
 	jz4740_intc_suspend();
+	jz4740_clock_suspend();
+
+	jz4740_clock_set_wait_mode(JZ4740_WAIT_MODE_SLEEP);
 
- 	/* Enter SLEEP mode */
-	REG_CPM_LCR &= ~CPM_LCR_LPM_MASK;
-	REG_CPM_LCR |= CPM_LCR_LPM_SLEEP;
 	__asm__(".set\tmips3\n\t"
 		"wait\n\t"
 		".set\tmips0");
 
-	/* Restore to IDLE mode */
-	REG_CPM_LCR &= ~CPM_LCR_LPM_MASK;
-	REG_CPM_LCR |= CPM_LCR_LPM_IDLE;
-
-	/* Restore nand flash control register */
-	REG_EMC_NFCSR = nfcsr;
+	jz4740_clock_set_wait_mode(JZ4740_WAIT_MODE_IDLE);
 
+	jz4740_clock_resume();
 	jz4740_intc_resume();
-
-	/* Restore sleep control register */
-	REG_CPM_SCR = scr;
+	jz_gpio_resume();
 
 	return 0;
 }