Changeset 4073

Timestamp:

02/16/08 10:35:08 (5 years ago)

Author:

werner

Message:

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

Location:

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

Files:

• gta01-pcf50606.patch (modified) (2 diffs)
• pcf50633.patch (modified) (2 diffs)

branches/src/target/kernel/2.6.24.x/patches/gta01-pcf50606.patch

@@ -9 +9 @@
 --- /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
 + *
@@ -1221 +1221 @@
 +
 +       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);

branches/src/target/kernel/2.6.24.x/patches/pcf50633.patch

@@ -35 +35 @@
 --- /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
 + *
@@ -1341 +1341 @@
 +
 +       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);