From 5c2973e8068f049f085beb8690b7d504bc1858a4 Mon Sep 17 00:00:00 2001 From: Haojian Zhuang Date: Wed, 3 Feb 2010 10:01:18 -0500 Subject: [PATCH] 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 --- arch/arm/mach-mmp/common.h | 1 + arch/arm/mach-mmp/irq-mmp2.c | 14 +++++++++++--- arch/arm/mach-mmp/mmp2.c | 10 ++++++++++ 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-mmp/common.h b/arch/arm/mach-mmp/common.h index 18c037f..b4a0ba0 100644 --- a/arch/arm/mach-mmp/common.h +++ b/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/arch/arm/mach-mmp/irq-mmp2.c b/arch/arm/mach-mmp/irq-mmp2.c index 3ae1c54..a6ca00c 100644 --- a/arch/arm/mach-mmp/irq-mmp2.c +++ b/arch/arm/mach-mmp/irq-mmp2.c @@ -38,10 +38,15 @@ static void icu_unmask_irq(unsigned int irq) static struct irq_chip icu_irq_chip = { .name = "icu_irq", .mask = icu_mask_irq, - .mask_ack = icu_mask_irq, .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 +87,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, \ } @@ -97,7 +101,9 @@ static void init_mux_irq(struct irq_chip *chip, int start, int num) int irq; for (irq = start; num > 0; irq++, num--) { - chip->mask_ack(irq); + chip->mask(irq); + if (chip->ack) + chip->ack(irq); set_irq_chip(irq, chip); set_irq_flags(irq, IRQF_VALID); set_irq_handler(irq, handle_level_irq); @@ -126,6 +132,8 @@ void __init mmp2_init_icu(void) } } + 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/arch/arm/mach-mmp/mmp2.c b/arch/arm/mach-mmp/mmp2.c index 0f1c441..72eb9da 100644 --- a/arch/arm/mach-mmp/mmp2.c +++ b/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; -- 1.5.6.5