From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Tue, 7 Oct 2008 18:08:56 +0000 (+0100)
Subject: Merge branches 'pxa-core' and 'pxa-machines' into pxa-all
X-Git-Tag: v2.6.28-rc1~293^2~6^2~17
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5a89770daad83df74d77a8d34a1ffaedae565ce9;p=linux-2.6-omap-h63xx.git

Merge branches 'pxa-core' and 'pxa-machines' into pxa-all

Conflicts:

	arch/arm/mach-pxa/Kconfig
	arch/arm/mach-pxa/pxa25x.c
	arch/arm/mach-pxa/pxa27x.c
---

5a89770daad83df74d77a8d34a1ffaedae565ce9
diff --cc arch/arm/mach-pxa/pxa25x.c
index 3caa74a10d1,f0eda209449..25d17a1dab7
--- a/arch/arm/mach-pxa/pxa25x.c
+++ b/arch/arm/mach-pxa/pxa25x.c
@@@ -240,14 -218,9 +224,6 @@@ static void pxa25x_cpu_pm_save(unsigne
  
  static void pxa25x_cpu_pm_restore(unsigned long *sleep_save)
  {
- 	/* restore registers */
- 	RESTORE(GAFR0_L); RESTORE(GAFR0_U);
- 	RESTORE(GAFR1_L); RESTORE(GAFR1_U);
- 	RESTORE(GAFR2_L); RESTORE(GAFR2_U);
- 	RESTORE(PGSR0); RESTORE(PGSR1); RESTORE(PGSR2);
- 
- 	PSSR = PSSR_RDH | PSSR_PH;
 -	/* ensure not to come back here if it wasn't intended */
 -	PSPR = 0;
--
  	RESTORE(CKEN);
  	RESTORE(PSTR);
  }
diff --cc arch/arm/mach-pxa/pxa27x.c
index 4835207c142,0288665ad03..bf01e14098f
--- a/arch/arm/mach-pxa/pxa27x.c
+++ b/arch/arm/mach-pxa/pxa27x.c
@@@ -220,16 -202,11 +202,8 @@@ void pxa27x_cpu_pm_save(unsigned long *
  
  void pxa27x_cpu_pm_restore(unsigned long *sleep_save)
  {
- 	/* restore registers */
- 	RESTORE(GAFR0_L); RESTORE(GAFR0_U);
- 	RESTORE(GAFR1_L); RESTORE(GAFR1_U);
- 	RESTORE(GAFR2_L); RESTORE(GAFR2_U);
- 	RESTORE(GAFR3_L); RESTORE(GAFR3_U);
- 	RESTORE(PGSR0); RESTORE(PGSR1); RESTORE(PGSR2); RESTORE(PGSR3);
 -	/* ensure not to come back here if it wasn't intended */
 -	PSPR = 0;
--
  	RESTORE(MDREFR);
- 	RESTORE(PWER); RESTORE(PCFR); RESTORE(PRER);
- 	RESTORE(PFER); RESTORE(PKWR);
+ 	RESTORE(PCFR);
  
  	PSSR = PSSR_RDH | PSSR_PH;