From d5fae3cebcf07df906e6802f6bfcef183b09d70f Mon Sep 17 00:00:00 2001
From: Daniel Lezcano <daniel.lezcano@linaro.org>
Date: Tue, 28 Feb 2012 22:46:08 +0100
Subject: [PATCH] --- yaml --- r: 296863 b: refs/heads/master c:
 9ab492e12d588af7b05892c3744e8bdc2eace6d0 h: refs/heads/master i:   296861:
 1d687b8d86d38470552e34bcd3b6455fe074bf3a   296859:
 a25baf525e79bf8cac896e8a86b485e45dd3faf5   296855:
 65cae13cb2b348459756c4cf45f1edd27c4e0b8d   296847:
 6c0b1cfe99cab837ca5dc599e231123eeb658720   296831:
 9a955b4fdb7745ff9787053b875528e5dcdb497d v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/mfd/db8500-prcmu.c       | 20 ++++++++++++++++++++
 trunk/include/linux/mfd/db8500-prcmu.h |  1 +
 trunk/include/linux/mfd/dbx500-prcmu.h |  8 ++++++++
 4 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 13812107f944..bd2e7c7c77df 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9f60d33e1811e0aa696a3152050d6e3e4c3195aa
+refs/heads/master: 9ab492e12d588af7b05892c3744e8bdc2eace6d0
diff --git a/trunk/drivers/mfd/db8500-prcmu.c b/trunk/drivers/mfd/db8500-prcmu.c
index 97341aa4025c..4e27db841fab 100644
--- a/trunk/drivers/mfd/db8500-prcmu.c
+++ b/trunk/drivers/mfd/db8500-prcmu.c
@@ -883,6 +883,26 @@ bool db8500_prcmu_gic_pending_irq(void)
 	return false;
 }
 
+/*
+ * This function checks if there are pending interrupt on the
+ * prcmu which has been delegated to monitor the irqs with the
+ * db8500_prcmu_copy_gic_settings function.
+ */
+bool db8500_prcmu_pending_irq(void)
+{
+	u32 it, im;
+	int i;
+
+	for (i = 0; i < PRCMU_GIC_NUMBER_REGS - 1; i++) {
+		it = readl(PRCM_ARMITVAL31TO0 + i * 4);
+		im = readl(PRCM_ARMITMSK31TO0 + i * 4);
+		if (it & im)
+			return true; /* There is a pending interrupt */
+	}
+
+	return false;
+}
+
 /*
  * This function copies the gic SPI settings to the prcmu in order to
  * monitor them and abort/finish the retention/off sequence or state.
diff --git a/trunk/include/linux/mfd/db8500-prcmu.h b/trunk/include/linux/mfd/db8500-prcmu.h
index a5915852176a..926bdb3adc0f 100644
--- a/trunk/include/linux/mfd/db8500-prcmu.h
+++ b/trunk/include/linux/mfd/db8500-prcmu.h
@@ -584,6 +584,7 @@ int db8500_prcmu_gic_decouple(void);
 int db8500_prcmu_gic_recouple(void);
 int db8500_prcmu_copy_gic_settings(void);
 bool db8500_prcmu_gic_pending_irq(void);
+bool db8500_prcmu_pending_irq(void);
 void db8500_prcmu_enable_wakeups(u32 wakeups);
 int db8500_prcmu_set_epod(u16 epod_id, u8 epod_state);
 int db8500_prcmu_request_clock(u8 clock, bool enable);
diff --git a/trunk/include/linux/mfd/dbx500-prcmu.h b/trunk/include/linux/mfd/dbx500-prcmu.h
index f8429cad0db7..5c72c07e20e4 100644
--- a/trunk/include/linux/mfd/dbx500-prcmu.h
+++ b/trunk/include/linux/mfd/dbx500-prcmu.h
@@ -313,6 +313,14 @@ static inline int prcmu_copy_gic_settings(void)
 		return db8500_prcmu_copy_gic_settings();
 }
 
+static inline bool prcmu_pending_irq(void)
+{
+        if (cpu_is_u5500())
+                return -EINVAL;
+        else
+                return db8500_prcmu_pending_irq();
+}
+
 static inline int prcmu_set_epod(u16 epod_id, u8 epod_state)
 {
 	if (cpu_is_u5500())