diff options
author | Henning Heinold <heinold@inf.fu-berlin.de> | 2008-03-17 22:08:29 +0000 |
---|---|---|
committer | Henning Heinold <heinold@inf.fu-berlin.de> | 2008-03-17 22:08:29 +0000 |
commit | 06888e066bae0f58ff7e1082d33cb84183c1d6d6 (patch) | |
tree | 84f60afb5d872be81fdb08c645e0e99bf5a5eeb4 /packages/linux/linux-2.6.24 | |
parent | 6cc27ed49193fa0314d1f7b7ba0463a46f7dbc81 (diff) |
linux-2.6.24: fix sa1100-rtc
* hopefully fix the rtc1hz and rtcalarm register bug
* added patch under linux-2.6.24/simpad/
* bump pr
* thanks MrData for the patch
Diffstat (limited to 'packages/linux/linux-2.6.24')
-rw-r--r-- | packages/linux/linux-2.6.24/simpad/linux-2.6.24-SIMpad-rtc-sa1100.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/packages/linux/linux-2.6.24/simpad/linux-2.6.24-SIMpad-rtc-sa1100.patch b/packages/linux/linux-2.6.24/simpad/linux-2.6.24-SIMpad-rtc-sa1100.patch new file mode 100644 index 0000000000..6e09bfd103 --- /dev/null +++ b/packages/linux/linux-2.6.24/simpad/linux-2.6.24-SIMpad-rtc-sa1100.patch @@ -0,0 +1,28 @@ +diff -Nur linux-2.6.24.vanilla/drivers/rtc/rtc-sa1100.c linux-2.6.24/drivers/rtc/rtc-sa1100.c +--- linux-2.6.24.vanilla/drivers/rtc/rtc-sa1100.c 2008-01-24 23:58:37.000000000 +0100 ++++ linux-2.6.24/drivers/rtc/rtc-sa1100.c 2008-03-17 20:52:41.000000000 +0100 +@@ -15,6 +15,10 @@ + * Converted to the RTC subsystem and Driver Model + * by Richard Purdie <rpurdie@rpsys.net> + * ++ * 2008/03/17 mrdata: ++ * disable IRQ RTC1Hz and RTCAlrm before request_irq ++ * in sa1100_rtc_open() ++ * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version +@@ -154,7 +158,12 @@ + static int sa1100_rtc_open(struct device *dev) + { + int ret; +- ++ ++ spin_lock_irq(&sa1100_rtc_lock); ++ RTSR &= ~RTSR_HZE; ++ RTSR &= ~RTSR_ALE; ++ spin_unlock_irq(&sa1100_rtc_lock); ++ + ret = request_irq(IRQ_RTC1Hz, sa1100_rtc_interrupt, IRQF_DISABLED, + "rtc 1Hz", dev); + if (ret) { |