aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mmp/irq-mmp2.c
diff options
context:
space:
mode:
authorHaojian Zhuang <haojian.zhuang@marvell.com>2010-02-03 10:01:18 -0500
committerEric Miao <eric.y.miao@gmail.com>2010-03-01 18:40:57 -0500
commitdf0c382436df5bdd74030baafa294b75c231ec8c (patch)
treedbcf772218fcc1dde83ebb08395f1d1fa6326e51 /arch/arm/mach-mmp/irq-mmp2.c
parentce0ac4235972cc2533e4e2095396208b59117c57 (diff)
[ARM] mmp2: add handling on PMIC IRQ
Since PMIC INT pin is a special pin of CPU, the status of PMIC INT pin needs to be cleared after PMIC IRQ occured. Now append the clear operation in irq chip handler. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'arch/arm/mach-mmp/irq-mmp2.c')
-rw-r--r--arch/arm/mach-mmp/irq-mmp2.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/arch/arm/mach-mmp/irq-mmp2.c b/arch/arm/mach-mmp/irq-mmp2.c
index 3ae1c543707c..b187c027822d 100644
--- a/arch/arm/mach-mmp/irq-mmp2.c
+++ b/arch/arm/mach-mmp/irq-mmp2.c
@@ -42,6 +42,12 @@ static struct irq_chip icu_irq_chip = {
42 .unmask = icu_unmask_irq, 42 .unmask = icu_unmask_irq,
43}; 43};
44 44
45static void pmic_irq_ack(unsigned int irq)
46{
47 if (irq == IRQ_MMP2_PMIC)
48 mmp2_clear_pmic_int();
49}
50
45#define SECOND_IRQ_MASK(_name_, irq_base, prefix) \ 51#define SECOND_IRQ_MASK(_name_, irq_base, prefix) \
46static void _name_##_mask_irq(unsigned int irq) \ 52static void _name_##_mask_irq(unsigned int irq) \
47{ \ 53{ \
@@ -82,7 +88,6 @@ SECOND_IRQ_DEMUX(_name_, irq_base, prefix) \
82static struct irq_chip _name_##_irq_chip = { \ 88static struct irq_chip _name_##_irq_chip = { \
83 .name = #_name_, \ 89 .name = #_name_, \
84 .mask = _name_##_mask_irq, \ 90 .mask = _name_##_mask_irq, \
85 .mask_ack = _name_##_mask_irq, \
86 .unmask = _name_##_unmask_irq, \ 91 .unmask = _name_##_unmask_irq, \
87} 92}
88 93
@@ -126,6 +131,11 @@ void __init mmp2_init_icu(void)
126 } 131 }
127 } 132 }
128 133
134 /* NOTE: IRQ_MMP2_PMIC requires the PMIC MFPR register
135 * to be written to clear the interrupt
136 */
137 pmic_irq_chip.ack = pmic_irq_ack;
138
129 init_mux_irq(&pmic_irq_chip, IRQ_MMP2_PMIC_BASE, 2); 139 init_mux_irq(&pmic_irq_chip, IRQ_MMP2_PMIC_BASE, 2);
130 init_mux_irq(&rtc_irq_chip, IRQ_MMP2_RTC_BASE, 2); 140 init_mux_irq(&rtc_irq_chip, IRQ_MMP2_RTC_BASE, 2);
131 init_mux_irq(&twsi_irq_chip, IRQ_MMP2_TWSI_BASE, 5); 141 init_mux_irq(&twsi_irq_chip, IRQ_MMP2_TWSI_BASE, 5);