|
From: <hap...@us...> - 2007-07-21 11:47:49
|
Revision: 1192
http://svn.sourceforge.net/hackndev/?rev=1192&view=rev
Author: happy-slapin
Date: 2007-07-21 04:47:19 -0700 (Sat, 21 Jul 2007)
Log Message:
-----------
z72 updates:
* Updated defconfig
All:
* Moved if to case statement in mach-pxa/pxa27x.c so it looks cleaner this way
Modified Paths:
--------------
linux4palm/linux/trunk/arch/arm/configs/palmz72_defconfig
linux4palm/linux/trunk/arch/arm/mach-pxa/pxa27x.c
Modified: linux4palm/linux/trunk/arch/arm/configs/palmz72_defconfig
===================================================================
--- linux4palm/linux/trunk/arch/arm/configs/palmz72_defconfig 2007-07-21 11:16:09 UTC (rev 1191)
+++ linux4palm/linux/trunk/arch/arm/configs/palmz72_defconfig 2007-07-21 11:47:19 UTC (rev 1192)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.21-hnd2
-# Fri Jun 29 05:00:38 2007
+# Tue Jul 17 01:10:55 2007
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -853,7 +853,6 @@
# CONFIG_SOC_T7L66XB is not set
# CONFIG_SOC_TC6387XB is not set
# CONFIG_SOC_TC6393XB is not set
-# CONFIG_SOC_TSC2101 is not set
# CONFIG_SOC_TSC2200 is not set
#
@@ -915,8 +914,8 @@
CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_BACKLIGHT_CLASS_DEVICE=y
# CONFIG_LCD_CLASS_DEVICE is not set
-# CONFIG_BACKLIGHT_CORGI is not set
-CONFIG_BACKLIGHT_PXAPWM=y
+CONFIG_BACKLIGHT_CORGI=y
+# CONFIG_BACKLIGHT_PXAPWM is not set
CONFIG_FB=y
CONFIG_FIRMWARE_EDID=y
# CONFIG_FB_DDC is not set
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/pxa27x.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/pxa27x.c 2007-07-21 11:16:09 UTC (rev 1191)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/pxa27x.c 2007-07-21 11:47:19 UTC (rev 1192)
@@ -138,14 +138,6 @@
{
extern void pxa_cpu_standby(void);
extern void pxa_cpu_suspend(unsigned int);
- 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;
@@ -160,7 +152,16 @@
pxa_cpu_standby();
break;
case PM_SUSPEND_MEM:
- pxa_cpu_suspend(PWRMODE_SLEEP);
+ 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.
+ */
+ pxa_cpu_standby();
+ } else {
+ pxa_cpu_suspend(PWRMODE_SLEEP);
+ }
break;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|