From c8cd9dba65e4d206a164ec9e82f0d9fc3299557e Mon Sep 17 00:00:00 2001
From: Rajkumar Kasirajan <rajkumar.kasirajan@stericsson.com>
Date: Tue, 29 May 2012 15:07:40 -0700
Subject: [PATCH] --- yaml --- r: 308997 b: refs/heads/master c:
 ac2dee5984bc78c8ff1893142f7322320d2baf05 h: refs/heads/master i:   308995:
 89e5dc481e84f4691782e71281471262bc415d9c v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/rtc/rtc-pl031.c | 14 +++-----------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index ce7ed500eae8..cdebe92bef7f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e862e7c4ee52c2d1a0af37a8c3a2bda079042b06
+refs/heads/master: ac2dee5984bc78c8ff1893142f7322320d2baf05
diff --git a/trunk/drivers/rtc/rtc-pl031.c b/trunk/drivers/rtc/rtc-pl031.c
index f027c063fb20..cc0533994f6e 100644
--- a/trunk/drivers/rtc/rtc-pl031.c
+++ b/trunk/drivers/rtc/rtc-pl031.c
@@ -220,17 +220,9 @@ static irqreturn_t pl031_interrupt(int irq, void *dev_id)
 	unsigned long events = 0;
 
 	rtcmis = readl(ldata->base + RTC_MIS);
-	if (rtcmis) {
-		writel(rtcmis, ldata->base + RTC_ICR);
-
-		if (rtcmis & RTC_BIT_AI)
-			events |= (RTC_AF | RTC_IRQF);
-
-		/* Timer interrupt is only available in ST variants */
-		if ((rtcmis & RTC_BIT_PI) &&
-			(ldata->hw_designer == AMBA_VENDOR_ST))
-			events |= (RTC_PF | RTC_IRQF);
-
+	if (rtcmis & RTC_BIT_AI) {
+		writel(RTC_BIT_AI, ldata->base + RTC_ICR);
+		events |= (RTC_AF | RTC_IRQF);
 		rtc_update_irq(ldata->rtc, 1, events);
 
 		return IRQ_HANDLED;