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

Commit 56b11288 authored by Richard Purdie's avatar Richard Purdie Committed by Russell King
Browse files

[ARM] 4735/1: Unbreak pxa25x suspend/resume 



Suspend/resume on the pxa25x was fairly obviously broken in revision
711be5cc.

This patch fixes the damage by adding back the missing code.

Signed-off-by: default avatarRichard Purdie <rpurdie@rpsys.net>
Acked-by: default avatarEric Miao <eric.y.miao@gmail.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent b8c9a187

arch/arm/mach-pxa/pxa25x.c

+12 −1
Original line number Diff line number Diff line
@@ -178,13 +178,19 @@ static void pxa25x_cpu_pm_save(unsigned long *sleep_save) 
	SAVE(GAFR1_L); SAVE(GAFR1_U);

	SAVE(GAFR2_L); SAVE(GAFR2_U);



	SAVE(ICMR);

	SAVE(ICMR); ICMR = 0;

	SAVE(CKEN);

	SAVE(PSTR);



	/* Clear GPIO transition detect bits */

	GEDR0 = GEDR0; GEDR1 = GEDR1; GEDR2 = GEDR2;

}



static void pxa25x_cpu_pm_restore(unsigned long *sleep_save)

{

	/* ensure not to come back here if it wasn't intended */

	PSPR = 0;



	/* restore registers */

	RESTORE_GPLEVEL(0); RESTORE_GPLEVEL(1); RESTORE_GPLEVEL(2);

	RESTORE(GPDR0); RESTORE(GPDR1); RESTORE(GPDR2);
@@ -195,7 +201,12 @@ static void pxa25x_cpu_pm_restore(unsigned long *sleep_save) 
	RESTORE(GFER0); RESTORE(GFER1); RESTORE(GFER2);

	RESTORE(PGSR0); RESTORE(PGSR1); RESTORE(PGSR2);



	PSSR = PSSR_RDH | PSSR_PH;



	RESTORE(CKEN);



	ICLR = 0;

	ICCR = 1;

	RESTORE(ICMR);

	RESTORE(PSTR);

}