diff options
author | Eric Miao <eric.y.miao@gmail.com> | 2011-04-27 10:48:04 -0400 |
---|---|---|
committer | Eric Miao <eric.y.miao@gmail.com> | 2011-07-12 07:45:21 -0400 |
commit | 5d284e353eb11ab2e8b1c5671ba06489b0bd1e0c (patch) | |
tree | 4c8edb89d7d977e39415df3a06b1af88012bb053 /arch/arm/mach-pxa/pxa3xx.c | |
parent | 9c86441081e84c9fb9fac3929c6e7d3e6f4dd891 (diff) |
ARM: pxa: avoid accessing interrupt registers directly
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'arch/arm/mach-pxa/pxa3xx.c')
-rw-r--r-- | arch/arm/mach-pxa/pxa3xx.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c index 8521d7d6f1da..e66dc1562cda 100644 --- a/arch/arm/mach-pxa/pxa3xx.c +++ b/arch/arm/mach-pxa/pxa3xx.c | |||
@@ -31,7 +31,6 @@ | |||
31 | #include <mach/ohci.h> | 31 | #include <mach/ohci.h> |
32 | #include <mach/pm.h> | 32 | #include <mach/pm.h> |
33 | #include <mach/dma.h> | 33 | #include <mach/dma.h> |
34 | #include <mach/regs-intc.h> | ||
35 | #include <mach/smemc.h> | 34 | #include <mach/smemc.h> |
36 | 35 | ||
37 | #include "generic.h" | 36 | #include "generic.h" |
@@ -328,13 +327,13 @@ static void pxa_ack_ext_wakeup(struct irq_data *d) | |||
328 | 327 | ||
329 | static void pxa_mask_ext_wakeup(struct irq_data *d) | 328 | static void pxa_mask_ext_wakeup(struct irq_data *d) |
330 | { | 329 | { |
331 | ICMR2 &= ~(1 << ((d->irq - PXA_IRQ(0)) & 0x1f)); | 330 | pxa_mask_irq(d); |
332 | PECR &= ~PECR_IE(d->irq - IRQ_WAKEUP0); | 331 | PECR &= ~PECR_IE(d->irq - IRQ_WAKEUP0); |
333 | } | 332 | } |
334 | 333 | ||
335 | static void pxa_unmask_ext_wakeup(struct irq_data *d) | 334 | static void pxa_unmask_ext_wakeup(struct irq_data *d) |
336 | { | 335 | { |
337 | ICMR2 |= 1 << ((d->irq - PXA_IRQ(0)) & 0x1f); | 336 | pxa_unmask_irq(d); |
338 | PECR |= PECR_IE(d->irq - IRQ_WAKEUP0); | 337 | PECR |= PECR_IE(d->irq - IRQ_WAKEUP0); |
339 | } | 338 | } |
340 | 339 | ||