From bdae0d0c8fa26e33c9da7b103ad2adb1bd9581a6 Mon Sep 17 00:00:00 2001
From: Haojian Zhuang <haojian.zhuang@marvell.com>
Date: Wed, 3 Feb 2010 10:01:18 -0500
Subject: [PATCH] --- yaml --- r: 187475 b: refs/heads/master c:
 df0c382436df5bdd74030baafa294b75c231ec8c h: refs/heads/master i:   187473:
 42ec730d2ac7be02a2a10ae8a0148b782a47f229   187471:
 393a06f0f04d4efa07c129c8f85e156433345ccc v: v3

---
 [refs]                             |  2 +-
 trunk/arch/arm/mach-mmp/common.h   |  1 +
 trunk/arch/arm/mach-mmp/irq-mmp2.c | 12 +++++++++++-
 trunk/arch/arm/mach-mmp/mmp2.c     | 10 ++++++++++
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index eb8bfcbf0c28..20032bb29121 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce0ac4235972cc2533e4e2095396208b59117c57
+refs/heads/master: df0c382436df5bdd74030baafa294b75c231ec8c
diff --git a/trunk/arch/arm/mach-mmp/common.h b/trunk/arch/arm/mach-mmp/common.h
index 18c037f8bb0a..b4a0ba05a0f4 100644
--- a/trunk/arch/arm/mach-mmp/common.h
+++ b/trunk/arch/arm/mach-mmp/common.h
@@ -3,6 +3,7 @@
 struct sys_timer;
 
 extern void timer_init(int irq);
+extern void mmp2_clear_pmic_int(void);
 
 extern struct sys_timer pxa168_timer;
 extern struct sys_timer pxa910_timer;
diff --git a/trunk/arch/arm/mach-mmp/irq-mmp2.c b/trunk/arch/arm/mach-mmp/irq-mmp2.c
index 3ae1c543707c..b187c027822d 100644
--- a/trunk/arch/arm/mach-mmp/irq-mmp2.c
+++ b/trunk/arch/arm/mach-mmp/irq-mmp2.c
@@ -42,6 +42,12 @@ static struct irq_chip icu_irq_chip = {
 	.unmask		= icu_unmask_irq,
 };
 
+static void pmic_irq_ack(unsigned int irq)
+{
+	if (irq == IRQ_MMP2_PMIC)
+		mmp2_clear_pmic_int();
+}
+
 #define SECOND_IRQ_MASK(_name_, irq_base, prefix)			\
 static void _name_##_mask_irq(unsigned int irq)				\
 {									\
@@ -82,7 +88,6 @@ SECOND_IRQ_DEMUX(_name_, irq_base, prefix)				\
 static struct irq_chip _name_##_irq_chip = {				\
 	.name		= #_name_,					\
 	.mask		= _name_##_mask_irq,				\
-	.mask_ack	= _name_##_mask_irq,				\
 	.unmask		= _name_##_unmask_irq,				\
 }
 
@@ -126,6 +131,11 @@ void __init mmp2_init_icu(void)
 		}
 	}
 
+	/* NOTE: IRQ_MMP2_PMIC requires the PMIC MFPR register
+	 * to be written to clear the interrupt
+	 */
+	pmic_irq_chip.ack = pmic_irq_ack;
+
 	init_mux_irq(&pmic_irq_chip, IRQ_MMP2_PMIC_BASE, 2);
 	init_mux_irq(&rtc_irq_chip, IRQ_MMP2_RTC_BASE, 2);
 	init_mux_irq(&twsi_irq_chip, IRQ_MMP2_TWSI_BASE, 5);
diff --git a/trunk/arch/arm/mach-mmp/mmp2.c b/trunk/arch/arm/mach-mmp/mmp2.c
index 0f1c441cc898..72eb9daeea99 100644
--- a/trunk/arch/arm/mach-mmp/mmp2.c
+++ b/trunk/arch/arm/mach-mmp/mmp2.c
@@ -37,6 +37,16 @@ static struct mfp_addr_map mmp2_addr_map[] __initdata = {
 	MFP_ADDR_END,
 };
 
+void mmp2_clear_pmic_int(void)
+{
+	unsigned long mfpr_pmic, data;
+
+	mfpr_pmic = APB_VIRT_BASE + 0x1e000 + 0x2c4;
+	data = __raw_readl(mfpr_pmic);
+	__raw_writel(data | (1 << 6), mfpr_pmic);
+	__raw_writel(data, mfpr_pmic);
+}
+
 static void __init mmp2_init_gpio(void)
 {
 	int i;