Skip to content

Commit

Permalink
[ARM] sa1100: stop doing our own rtc management over suspend
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Russell King authored and Russell King committed Jul 12, 2007
1 parent d1cbbd6 commit f3ebbc2
Showing 1 changed file with 0 additions and 9 deletions.
9 changes: 0 additions & 9 deletions arch/arm/mach-sa1100/pm.c
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,7 @@ enum { SLEEP_SAVE_SP = 0,
static int sa11x0_pm_enter(suspend_state_t state)
{
unsigned long gpio, sleep_save[SLEEP_SAVE_SIZE];
struct timespec delta, rtc;

/* preserve current time */
rtc.tv_sec = RCNR;
rtc.tv_nsec = 0;
save_time_delta(&delta, &rtc);
gpio = GPLR;

/* save vital registers */
Expand Down Expand Up @@ -119,10 +114,6 @@ static int sa11x0_pm_enter(suspend_state_t state)
*/
PSSR = PSSR_PH;

/* restore current time */
rtc.tv_sec = RCNR;
restore_time_delta(&delta, &rtc);

return 0;
}

Expand Down

0 comments on commit f3ebbc2

Please sign in to comment.