diff options
| author | merge <null@invalid> | 2008-12-05 09:59:34 +0000 |
|---|---|---|
| committer | Andy Green <agreen@pads.home.warmcat.com> | 2008-12-05 09:59:34 +0000 |
| commit | 361fff778b7c4d2c78f28833415335148d86a1aa (patch) | |
| tree | e616c940a691b9ff548b1aaeb747eae8a1342509 /drivers/rtc | |
| parent | 5adc83c203167f77dd9b975ee275e3014287d6c7 (diff) | |
MERGE-via-pending-tracking-hist-MERGE-via-stable-tracking-build-fix-path-to-toolchain-on-1228470136
pending-tracking-hist top was MERGE-via-stable-tracking-build-fix-path-to-toolchain-on-1228470136 / 21b67ab8e79998b0a534263282dab1dda0f11b00 ... parent commitmessage:
From: merge <null@invalid>
MERGE-via-stable-tracking-hist-build-fix-path-to-toolchain-on
stable-tracking-hist top was build-fix-path-to-toolchain-on / ca14ba894df9b28822066c578dde48d7dbe931de ... parent commitmessage:
From: Andy Green <andy@openmoko.com>
build-fix-path-to-toolchain-one-at-last.patch
Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'drivers/rtc')
| -rw-r--r-- | drivers/rtc/rtc-pcf50606.c | 3 | ||||
| -rw-r--r-- | drivers/rtc/rtc-pcf50633.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/drivers/rtc/rtc-pcf50606.c b/drivers/rtc/rtc-pcf50606.c index 498ec77c82f..841ea28ca56 100644 --- a/drivers/rtc/rtc-pcf50606.c +++ b/drivers/rtc/rtc-pcf50606.c @@ -207,6 +207,9 @@ static int pcf50606_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) rtc2pcf_time(&pcf_tm, &alrm->time); + /* do like mktime does and ignore tm_wday */ + pcf_tm.time[PCF50606_TI_WKDAY] = 7; + alarm_masked = pcf50606_irq_mask_get(pcf, PCF50606_IRQ_ALARM); /* disable alarm interrupt */ diff --git a/drivers/rtc/rtc-pcf50633.c b/drivers/rtc/rtc-pcf50633.c index 00b159920b4..e1576d24254 100644 --- a/drivers/rtc/rtc-pcf50633.c +++ b/drivers/rtc/rtc-pcf50633.c @@ -207,6 +207,9 @@ static int pcf50633_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) rtc2pcf_time(&pcf_tm, &alrm->time); + /* do like mktime does and ignore tm_wday */ + pcf_tm.time[PCF50633_TI_WKDAY] = 7; + alarm_masked = pcf50633_irq_mask_get(pcf, PCF50633_IRQ_ALARM); /* disable alarm interrupt */ |