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

Commit 2aca0a86 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

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

arch/arm/mach-pxa/pm.c

+0 −10
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ int pxa_pm_enter(suspend_state_t state) 
{

	unsigned long sleep_save[SLEEP_SAVE_SIZE];

	unsigned long checksum = 0;

	struct timespec delta, rtc;

	int i;

	extern void pxa_cpu_pm_enter(suspend_state_t state);
@@ -87,11 +86,6 @@ int pxa_pm_enter(suspend_state_t state) 
		iwmmxt_task_disable(NULL);

#endif



	/* preserve current time */

	rtc.tv_sec = RCNR;

	rtc.tv_nsec = 0;

	save_time_delta(&delta, &rtc);



	SAVE(GPLR0); SAVE(GPLR1); SAVE(GPLR2);

	SAVE(GPDR0); SAVE(GPDR1); SAVE(GPDR2);

	SAVE(GRER0); SAVE(GRER1); SAVE(GRER2);
@@ -183,10 +177,6 @@ int pxa_pm_enter(suspend_state_t state) 


	RESTORE(PSTR);



	/* restore current time */

	rtc.tv_sec = RCNR;

	restore_time_delta(&delta, &rtc);



#ifdef DEBUG

	printk(KERN_DEBUG "*** made it back from resume\n");

#endif