diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-06-27 04:56:05 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-07-12 09:28:16 -0400 |
commit | 2aca0a865722fce435034cee5a33e1726fe10a9f (patch) | |
tree | 6c443cc3dc0c4d9e19d32aaf35e916a982d8ac02 | |
parent | f53f066c25036210036730d64c876ea586114425 (diff) |
[ARM] pxa: stop doing our own rtc management over suspend
Remove the RTC management over a suspend/resume cycle. Firstly,
we may not be using the internal RTC for time keeping; some
platforms have an external RTC for this inspite of the PXA having
an internal RTC. Secondly, the RTC library code handles updating
system time on resume.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r-- | arch/arm/mach-pxa/pm.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm/mach-pxa/pm.c b/arch/arm/mach-pxa/pm.c index d439ffa1b071..e66dbc26add1 100644 --- a/arch/arm/mach-pxa/pm.c +++ b/arch/arm/mach-pxa/pm.c | |||
@@ -77,7 +77,6 @@ int pxa_pm_enter(suspend_state_t state) | |||
77 | { | 77 | { |
78 | unsigned long sleep_save[SLEEP_SAVE_SIZE]; | 78 | unsigned long sleep_save[SLEEP_SAVE_SIZE]; |
79 | unsigned long checksum = 0; | 79 | unsigned long checksum = 0; |
80 | struct timespec delta, rtc; | ||
81 | int i; | 80 | int i; |
82 | extern void pxa_cpu_pm_enter(suspend_state_t state); | 81 | extern void pxa_cpu_pm_enter(suspend_state_t state); |
83 | 82 | ||
@@ -87,11 +86,6 @@ int pxa_pm_enter(suspend_state_t state) | |||
87 | iwmmxt_task_disable(NULL); | 86 | iwmmxt_task_disable(NULL); |
88 | #endif | 87 | #endif |
89 | 88 | ||
90 | /* preserve current time */ | ||
91 | rtc.tv_sec = RCNR; | ||
92 | rtc.tv_nsec = 0; | ||
93 | save_time_delta(&delta, &rtc); | ||
94 | |||
95 | SAVE(GPLR0); SAVE(GPLR1); SAVE(GPLR2); | 89 | SAVE(GPLR0); SAVE(GPLR1); SAVE(GPLR2); |
96 | SAVE(GPDR0); SAVE(GPDR1); SAVE(GPDR2); | 90 | SAVE(GPDR0); SAVE(GPDR1); SAVE(GPDR2); |
97 | SAVE(GRER0); SAVE(GRER1); SAVE(GRER2); | 91 | SAVE(GRER0); SAVE(GRER1); SAVE(GRER2); |
@@ -183,10 +177,6 @@ int pxa_pm_enter(suspend_state_t state) | |||
183 | 177 | ||
184 | RESTORE(PSTR); | 178 | RESTORE(PSTR); |
185 | 179 | ||
186 | /* restore current time */ | ||
187 | rtc.tv_sec = RCNR; | ||
188 | restore_time_delta(&delta, &rtc); | ||
189 | |||
190 | #ifdef DEBUG | 180 | #ifdef DEBUG |
191 | printk(KERN_DEBUG "*** made it back from resume\n"); | 181 | printk(KERN_DEBUG "*** made it back from resume\n"); |
192 | #endif | 182 | #endif |