diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-07-12 16:29:06 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-07-12 16:29:06 -0400 |
commit | f3ebbc20ab835ff98cf920f85de989064e352ee5 (patch) | |
tree | 83ca9c7a15e2a8561f15aa78e6bb6e44d29b0da7 /arch/arm | |
parent | d1cbbd6b413510c6512f4f80ffd48db1a8dd554a (diff) |
[ARM] sa1100: stop doing our own rtc management over suspend
Remove the RTC management over a suspend/resume cycle. As per the
corresponding PXA patch, the RTC library code handles updating
system time on resume.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-sa1100/pm.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/arm/mach-sa1100/pm.c b/arch/arm/mach-sa1100/pm.c index d674cf343156..01a37d3c0727 100644 --- a/arch/arm/mach-sa1100/pm.c +++ b/arch/arm/mach-sa1100/pm.c | |||
@@ -57,12 +57,7 @@ enum { SLEEP_SAVE_SP = 0, | |||
57 | static int sa11x0_pm_enter(suspend_state_t state) | 57 | static int sa11x0_pm_enter(suspend_state_t state) |
58 | { | 58 | { |
59 | unsigned long gpio, sleep_save[SLEEP_SAVE_SIZE]; | 59 | unsigned long gpio, sleep_save[SLEEP_SAVE_SIZE]; |
60 | struct timespec delta, rtc; | ||
61 | 60 | ||
62 | /* preserve current time */ | ||
63 | rtc.tv_sec = RCNR; | ||
64 | rtc.tv_nsec = 0; | ||
65 | save_time_delta(&delta, &rtc); | ||
66 | gpio = GPLR; | 61 | gpio = GPLR; |
67 | 62 | ||
68 | /* save vital registers */ | 63 | /* save vital registers */ |
@@ -119,10 +114,6 @@ static int sa11x0_pm_enter(suspend_state_t state) | |||
119 | */ | 114 | */ |
120 | PSSR = PSSR_PH; | 115 | PSSR = PSSR_PH; |
121 | 116 | ||
122 | /* restore current time */ | ||
123 | rtc.tv_sec = RCNR; | ||
124 | restore_time_delta(&delta, &rtc); | ||
125 | |||
126 | return 0; | 117 | return 0; |
127 | } | 118 | } |
128 | 119 | ||