summaryrefslogtreecommitdiffstats
path: root/drivers/rtc/rtc-at91rm9200.h
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2013-04-05 18:16:34 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2013-04-05 09:36:53 -0700
commite24b0bfa2f0446ffaad2661040be23668133aef8 (patch)
treeed45725874c8e4e9059cc0e25e928f8995493a41 /drivers/rtc/rtc-at91rm9200.h
parentc4c80f63fb97cd9a82cd35579eeb6467f3d485fc (diff)
downloadlinux-e24b0bfa2f0446ffaad2661040be23668133aef8.tar.bz2
Revert "drivers/rtc/rtc-at91rm9200.c: use a variable for storing IMR"
This reverts commit 0ef1594c017521ea89278e80fe3f80dafb17abde. This patch introduced a few races which cannot be easily fixed with a small follow-up patch. Furthermore, the SoC with the broken hardware register, which this patch intended to add support for, can only be used with device trees, which this driver currently does not support. [ Here is the discussion that led to this "revert" patch: https://lkml.org/lkml/2013/4/3/176 ] Cc: stable <stable@vger.kernel.org> Signed-off-by: Johan Hovold <jhovold@gmail.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/rtc/rtc-at91rm9200.h')
-rw-r--r--drivers/rtc/rtc-at91rm9200.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/rtc/rtc-at91rm9200.h b/drivers/rtc/rtc-at91rm9200.h
index 5f940b6844cb..da1945e5f714 100644
--- a/drivers/rtc/rtc-at91rm9200.h
+++ b/drivers/rtc/rtc-at91rm9200.h
@@ -64,6 +64,7 @@
#define AT91_RTC_SCCR 0x1c /* Status Clear Command Register */
#define AT91_RTC_IER 0x20 /* Interrupt Enable Register */
#define AT91_RTC_IDR 0x24 /* Interrupt Disable Register */
+#define AT91_RTC_IMR 0x28 /* Interrupt Mask Register */
#define AT91_RTC_VER 0x2c /* Valid Entry Register */
#define AT91_RTC_NVTIM (1 << 0) /* Non valid Time */