[Hackndev-commit] SF.net SVN: hackndev: [1187] linux4palm/linux/trunk/arch/arm/mach-pxa/ pxa27x.c

[<bob...@us...>]

Revision: 1187
          http://svn.sourceforge.net/hackndev/?rev=1187&view=rev
Author:   bobofdoom
Date:     2007-07-20 07:50:59 -0700 (Fri, 20 Jul 2007)

Log Message:
-----------
L4P: Cleanup pxa27x.c.

- Changed CONFIG_MACH_foo ifdefs to if (machine_is_foo) statement in the 
  sleep safely hack.

- Removed strange enabling of CKEN_PWM0 and CKEN_LCD

- Removed Treo 650 from sleep safely hack is suspend to RAM is now working
  on this device.

Modified Paths:
--------------
    linux4palm/linux/trunk/arch/arm/mach-pxa/pxa27x.c

Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/pxa27x.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/pxa27x.c	2007-07-20 14:43:04 UTC (rev 1186)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/pxa27x.c	2007-07-20 14:50:59 UTC (rev 1187)
@@ -138,19 +138,17 @@
 {
 	extern void pxa_cpu_standby(void);
 	extern void pxa_cpu_suspend(unsigned int);
-#if defined(CONFIG_MACH_XSCALE_PALMLD) || defined(CONFIG_MACH_XSCALE_PALMTX) \
-    || defined(CONFIG_MACH_PALMZ72) || defined(CONFIG_MACH_XSCALE_PALMTT5) \
-    || defined(CONFIG_MACH_XSCALE_PALMTREO650)
-	/* For safety. suspend_mem puts the device in an unresetable state.
-	 * On TX one needs to desolder the battery to get out of it.
-	 */
-	if (state == PM_SUSPEND_MEM) state = PM_SUSPEND_STANDBY;
-#endif
-	if (state == PM_SUSPEND_STANDBY)
-		CKEN = CKEN22_MEMC | CKEN9_OSTIMER | CKEN16_LCD |CKEN0_PWM0;
-	else
-		CKEN = CKEN22_MEMC | CKEN9_OSTIMER;
+	if (machine_is_xscale_palmld() || machine_is_xscale_palmtx()
+		|| machine_is_palmz72() || machine_is_xscale_palmtt5()) {
+		/* For safety. suspend_mem puts the device in an unresetable 
+		 * state.
+	 	 * On TX one needs to desolder the battery to get out of it.
+	 	 */
+		if (state == PM_SUSPEND_MEM) state = PM_SUSPEND_STANDBY;
+	}
 
+	CKEN = CKEN22_MEMC | CKEN9_OSTIMER | CKEN19_KEYPAD;
+
 	/* ensure voltage-change sequencer not initiated, which hangs */
 	PCFR &= ~PCFR_FVC;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.