Author: richard
Date: Sun Jun 14 13:30:04 2009
New Revision: 6097
URL: http://svn.slimdevices.com/jive?rev=6097&view=rev
Log:
r6...@harrypotter (orig r6096): richard | 2009-06-14 21:29:33 +0100
r6...@harrypotter (orig r6036): richard | 2009-06-08 21:01:38 +0100
Bug: N/A
Description:
Make sure the power button can wake up from sleep.
r6...@harrypotter (orig r6038): richard | 2009-06-08 21:40:34 +0100
Bug: 12209
Description:
Fixed charger detection after suspend.
Modified:
7.4/branches/pango/ (props changed)
7.4/branches/pango/squeezeos/src/s3c2412/linux-2.6.22/arch/arm/plat-s3c24xx/pm.c
7.4/branches/pango/squeezeos/src/s3c2412/linux-2.6.22/drivers/char/jive/jive_mgmt.c
Propchange: 7.4/branches/pango/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Sun Jun 14 13:30:04 2009
@@ -3,8 +3,8 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2920
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.2/trunk:2921
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/private-branches/jive-refresh:3653
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:5922
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:5936
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:6038
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:6096
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2013
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified:
7.4/branches/pango/squeezeos/src/s3c2412/linux-2.6.22/arch/arm/plat-s3c24xx/pm.c
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeos/src/s3c2412/linux-2.6.22/arch/arm/plat-s3c24xx/pm.c?rev=6097&r1=6096&r2=6097&view=diff
==============================================================================
---
7.4/branches/pango/squeezeos/src/s3c2412/linux-2.6.22/arch/arm/plat-s3c24xx/pm.c
(original)
+++
7.4/branches/pango/squeezeos/src/s3c2412/linux-2.6.22/arch/arm/plat-s3c24xx/pm.c
Sun Jun 14 13:30:04 2009
@@ -120,6 +120,8 @@
SAVE_ITEM(S3C2410_DCLKCON),
};
+//#define CONFIG_S3C2410_PM_DEBUG
+
#ifdef CONFIG_S3C2410_PM_DEBUG
#define SAVE_UART(va) \
@@ -652,8 +654,8 @@
/* suspend */
s3c2410_pm_enter(state);
- /* only wake up on EINT4_7 and EINT8_23 */
-#define WAKEUP_MASK ((1 << 4) | (1 << 5))
+ /* only wake up on EINT3, EINT4_7 and EINT8_23 */
+#define WAKEUP_MASK ((1 << 3) | (1 << 4) | (1 << 5))
/* woken by rtc? */
eint_wakeup = ((__raw_readl(S3C2410_SRCPND) & WAKEUP_MASK) !=
0);
Modified:
7.4/branches/pango/squeezeos/src/s3c2412/linux-2.6.22/drivers/char/jive/jive_mgmt.c
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeos/src/s3c2412/linux-2.6.22/drivers/char/jive/jive_mgmt.c?rev=6097&r1=6096&r2=6097&view=diff
==============================================================================
---
7.4/branches/pango/squeezeos/src/s3c2412/linux-2.6.22/drivers/char/jive/jive_mgmt.c
(original)
+++
7.4/branches/pango/squeezeos/src/s3c2412/linux-2.6.22/drivers/char/jive/jive_mgmt.c
Sun Jun 14 13:30:04 2009
@@ -642,6 +642,7 @@
s3c2410_gpio_cfgpin(S3C2410_GPG3, S3C2410_GPG3_INP);
s3c2410_gpio_pullup(S3C2410_GPG3, 1);
nacpr = (s3c2410_gpio_getpin(S3C2410_GPG3) > 0);
+ s3c2410_gpio_cfgpin(S3C2410_GPG3, S3C2410_GPG3_EINT11);
battery_flat = (bat < BATTERY_FLAT_LEVEL) && nacpr;
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
