r4073 - branches/src/target/kernel/2.6.24.x/patches

[werner at sita.openmoko.org]

Author: werner
Date: 2008-02-16 10:35:08 +0100 (Sat, 16 Feb 2008)
New Revision: 4073

Modified:
   branches/src/target/kernel/2.6.24.x/patches/gta01-pcf50606.patch
   branches/src/target/kernel/2.6.24.x/patches/pcf50633.patch
Log:
When reading the PMU RTC alarm status, the "enabled" flag wasn't set to
indicate whether the alarm is active.

Note that the pcf50606 change is untested.

pcf50633.patch:
- drivers/i2c/chips/pcf50633.c (pcf50633_rtc_read_alarm): set alrm->enabled
gta01-pcf50606.patch:
- drivers/i2c/chips/pcf50606.c (pcf50606_rtc_read_alarm) set alrm->enabled



Modified: branches/src/target/kernel/2.6.24.x/patches/gta01-pcf50606.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/gta01-pcf50606.patch	2008-02-15 19:00:48 UTC (rev 4072)
+++ branches/src/target/kernel/2.6.24.x/patches/gta01-pcf50606.patch	2008-02-16 09:35:08 UTC (rev 4073)
@@ -8,7 +8,7 @@
 ===================================================================
 --- /dev/null
 +++ linux-2.6.24/drivers/i2c/chips/pcf50606.c
-@@ -0,0 +1,1937 @@
+@@ -0,0 +1,1939 @@
 +/* Philips/NXP PCF50606 Power Management Unit (PMU) driver
 + *
 + * (C) 2006-2007 by OpenMoko, Inc.
@@ -1220,6 +1220,8 @@
 +	struct pcf50606_time pcf_tm;
 +
 +	mutex_lock(&pcf->lock);
++	alrm->enabled = 
++             __reg_read(pcf, PCF50606_REG_INT1M) & PCF50606_INT1_ALARM ? 0 : 1;
 +	pcf_tm.sec = __reg_read(pcf, PCF50606_REG_RTCSCA);
 +	pcf_tm.min = __reg_read(pcf, PCF50606_REG_RTCMNA);
 +	pcf_tm.hour = __reg_read(pcf, PCF50606_REG_RTCHRA);

Modified: branches/src/target/kernel/2.6.24.x/patches/pcf50633.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/pcf50633.patch	2008-02-15 19:00:48 UTC (rev 4072)
+++ branches/src/target/kernel/2.6.24.x/patches/pcf50633.patch	2008-02-16 09:35:08 UTC (rev 4073)
@@ -34,7 +34,7 @@
 ===================================================================
 --- /dev/null
 +++ linux-2.6.24/drivers/i2c/chips/pcf50633.c
-@@ -0,0 +1,1954 @@
+@@ -0,0 +1,1956 @@
 +/* Philips PCF50633 Power Management Unit (PMU) driver
 + *
 + * (C) 2006-2007 by OpenMoko, Inc.
@@ -1340,6 +1340,8 @@
 +	struct pcf50633_time pcf_tm;
 +
 +	mutex_lock(&pcf->lock);
++	alrm->enabled =
++	     __reg_read(pcf, PCF50633_REG_INT1M) & PCF50633_INT1_ALARM ? 0 : 1;
 +	pcf_tm.sec = __reg_read(pcf, PCF50633_REG_RTCSCA);
 +	pcf_tm.min = __reg_read(pcf, PCF50633_REG_RTCMNA);
 +	pcf_tm.hour = __reg_read(pcf, PCF50633_REG_RTCHRA);