Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3ebbc20 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[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: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent d1cbbd6b

arch/arm/mach-sa1100/pm.c

+0 −9
Original line number Original line Diff line number Diff line
@@ -57,12 +57,7 @@ enum { SLEEP_SAVE_SP = 0, 
static int sa11x0_pm_enter(suspend_state_t state)

static int sa11x0_pm_enter(suspend_state_t state)

{

{

	unsigned long gpio, sleep_save[SLEEP_SAVE_SIZE];

	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;

	gpio = GPLR;





	/* save vital registers */

	/* save vital registers */
@@ -119,10 +114,6 @@ static int sa11x0_pm_enter(suspend_state_t state) 
	 */

	 */

	PSSR = PSSR_PH;

	PSSR = PSSR_PH;





	/* restore current time */

	rtc.tv_sec = RCNR;

	restore_time_delta(&delta, &rtc);



	return 0;

	return 0;

}

}