mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-04 01:49:36 +00:00
ARM: pxa: avoid accessing interrupt registers directly
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
This commit is contained in:
parent
9c86441081
commit
5d284e353e
5 changed files with 11 additions and 36 deletions
|
@ -104,4 +104,11 @@
|
|||
|
||||
#define NR_IRQS (IRQ_BOARD_START)
|
||||
|
||||
#ifndef __ASSEMBLY__
|
||||
struct irq_data;
|
||||
|
||||
void pxa_mask_irq(struct irq_data *);
|
||||
void pxa_unmask_irq(struct irq_data *);
|
||||
#endif
|
||||
|
||||
#endif /* __ASM_MACH_IRQS_H */
|
||||
|
|
|
@ -1,30 +0,0 @@
|
|||
#ifndef __ASM_MACH_REGS_INTC_H
|
||||
#define __ASM_MACH_REGS_INTC_H
|
||||
|
||||
#include <mach/hardware.h>
|
||||
|
||||
/*
|
||||
* Interrupt Controller
|
||||
*/
|
||||
|
||||
#define ICIP __REG(0x40D00000) /* Interrupt Controller IRQ Pending Register */
|
||||
#define ICMR __REG(0x40D00004) /* Interrupt Controller Mask Register */
|
||||
#define ICLR __REG(0x40D00008) /* Interrupt Controller Level Register */
|
||||
#define ICFP __REG(0x40D0000C) /* Interrupt Controller FIQ Pending Register */
|
||||
#define ICPR __REG(0x40D00010) /* Interrupt Controller Pending Register */
|
||||
#define ICCR __REG(0x40D00014) /* Interrupt Controller Control Register */
|
||||
#define ICHP __REG(0x40D00018) /* Interrupt Controller Highest Priority Register */
|
||||
|
||||
#define ICIP2 __REG(0x40D0009C) /* Interrupt Controller IRQ Pending Register 2 */
|
||||
#define ICMR2 __REG(0x40D000A0) /* Interrupt Controller Mask Register 2 */
|
||||
#define ICLR2 __REG(0x40D000A4) /* Interrupt Controller Level Register 2 */
|
||||
#define ICFP2 __REG(0x40D000A8) /* Interrupt Controller FIQ Pending Register 2 */
|
||||
#define ICPR2 __REG(0x40D000AC) /* Interrupt Controller Pending Register 2 */
|
||||
|
||||
#define ICIP3 __REG(0x40D00130) /* Interrupt Controller IRQ Pending Register 3 */
|
||||
#define ICMR3 __REG(0x40D00134) /* Interrupt Controller Mask Register 3 */
|
||||
#define ICLR3 __REG(0x40D00138) /* Interrupt Controller Level Register 3 */
|
||||
#define ICFP3 __REG(0x40D0013C) /* Interrupt Controller FIQ Pending Register 3 */
|
||||
#define ICPR3 __REG(0x40D00140) /* Interrupt Controller Pending Register 3 */
|
||||
|
||||
#endif /* __ASM_MACH_REGS_INTC_H */
|
|
@ -64,7 +64,7 @@ static inline void __iomem *irq_base(int i)
|
|||
return (void __iomem *)io_p2v(phys_base[i]);
|
||||
}
|
||||
|
||||
static void pxa_mask_irq(struct irq_data *d)
|
||||
void pxa_mask_irq(struct irq_data *d)
|
||||
{
|
||||
void __iomem *base = irq_data_get_irq_chip_data(d);
|
||||
uint32_t icmr = __raw_readl(base + ICMR);
|
||||
|
@ -73,7 +73,7 @@ static void pxa_mask_irq(struct irq_data *d)
|
|||
__raw_writel(icmr, base + ICMR);
|
||||
}
|
||||
|
||||
static void pxa_unmask_irq(struct irq_data *d)
|
||||
void pxa_unmask_irq(struct irq_data *d)
|
||||
{
|
||||
void __iomem *base = irq_data_get_irq_chip_data(d);
|
||||
uint32_t icmr = __raw_readl(base + ICMR);
|
||||
|
|
|
@ -31,7 +31,6 @@
|
|||
#include <mach/ohci.h>
|
||||
#include <mach/pm.h>
|
||||
#include <mach/dma.h>
|
||||
#include <mach/regs-intc.h>
|
||||
#include <mach/smemc.h>
|
||||
|
||||
#include "generic.h"
|
||||
|
@ -328,13 +327,13 @@ static void pxa_ack_ext_wakeup(struct irq_data *d)
|
|||
|
||||
static void pxa_mask_ext_wakeup(struct irq_data *d)
|
||||
{
|
||||
ICMR2 &= ~(1 << ((d->irq - PXA_IRQ(0)) & 0x1f));
|
||||
pxa_mask_irq(d);
|
||||
PECR &= ~PECR_IE(d->irq - IRQ_WAKEUP0);
|
||||
}
|
||||
|
||||
static void pxa_unmask_ext_wakeup(struct irq_data *d)
|
||||
{
|
||||
ICMR2 |= 1 << ((d->irq - PXA_IRQ(0)) & 0x1f);
|
||||
pxa_unmask_irq(d);
|
||||
PECR |= PECR_IE(d->irq - IRQ_WAKEUP0);
|
||||
}
|
||||
|
||||
|
|
|
@ -27,7 +27,6 @@
|
|||
#include <mach/reset.h>
|
||||
#include <mach/pm.h>
|
||||
#include <mach/dma.h>
|
||||
#include <mach/regs-intc.h>
|
||||
|
||||
#include "generic.h"
|
||||
#include "devices.h"
|
||||
|
|
Loading…
Reference in a new issue