qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-29 14:27:42 +02:00
Code

jz4740: pm.c buildfix and cleanup

Browse Source
This commit is contained in:
Lars-Peter Clausen 2010-01-08 00:04:01 +01:00
parent cc3e4bc548
commit 5405742d1e
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
target/linux/xburst/files-2.6.31/arch/mips/jz4740/pm.c
View File

@ -29,18 +29,12 @@
extern void jz4740_intc_suspend(void); extern void jz4740_intc_suspend(void);
extern void jz4740_intc_resume(void); extern void jz4740_intc_resume(void);
extern void jz_gpiolib_suspend(void);
extern void jz_gpiolib_resume(void);
static int jz_pm_enter(suspend_state_t state) static int jz_pm_enter(suspend_state_t state)
{ {
unsigned long delta;
unsigned long nfcsr = REG_EMC_NFCSR; unsigned long nfcsr = REG_EMC_NFCSR;
uint32_t scr = REG_CPM_SCR; uint32_t scr = REG_CPM_SCR;
/* Preserve current time */
delta = xtime.tv_sec - REG_RTC_RSR;
/* Disable nand flash */ /* Disable nand flash */
REG_EMC_NFCSR = ~0xff; REG_EMC_NFCSR = ~0xff;
@ -50,7 +44,6 @@ static int jz_pm_enter(suspend_state_t state)
REG_CPM_SCR &= ~( 1<<6 | 1<<7); REG_CPM_SCR &= ~( 1<<6 | 1<<7);
REG_CPM_SCR |= 0<<6 | 1<<7; REG_CPM_SCR |= 0<<6 | 1<<7;
jz_gpiolib_suspend();
jz4740_intc_suspend(); jz4740_intc_suspend();
/* Enter SLEEP mode */ /* Enter SLEEP mode */
@ -68,14 +61,10 @@ static int jz_pm_enter(suspend_state_t state)
REG_EMC_NFCSR = nfcsr; REG_EMC_NFCSR = nfcsr;
jz4740_intc_resume(); jz4740_intc_resume();
jz_gpiolib_resume();
/* Restore sleep control register */ /* Restore sleep control register */
REG_CPM_SCR = scr; REG_CPM_SCR = scr;
/* Restore current time */
xtime.tv_sec = REG_RTC_RSR + delta;
return 0; return 0;
} }