leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: omap2: irq_data conversion.

Browse Source 
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
This commit is contained in:
Lennert Buytenhek 2010-11-29 10:39:59 +01:00
parent a51eef7eb4
commit df303477bd
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
arch/arm/mach-omap2/irq.c
View File

@ -100,13 +100,14 @@ static int omap_check_spurious(unsigned int irq)
} }
/* XXX: FIQ and additional INTC support (only MPU at the moment) */ /* XXX: FIQ and additional INTC support (only MPU at the moment) */
static void omap_ack_irq(unsigned int irq) static void omap_ack_irq(struct irq_data *d)
{ {
intc_bank_write_reg(0x1, &irq_banks[0], INTC_CONTROL); intc_bank_write_reg(0x1, &irq_banks[0], INTC_CONTROL);
} }
static void omap_mask_irq(unsigned int irq) static void omap_mask_irq(struct irq_data *d)
{ {
unsigned int irq = d->irq;
int offset = irq & (~(IRQ_BITS_PER_REG - 1)); int offset = irq & (~(IRQ_BITS_PER_REG - 1));
if (cpu_is_omap34xx()) { if (cpu_is_omap34xx()) {
@ -128,8 +129,9 @@ static void omap_mask_irq(unsigned int irq)
intc_bank_write_reg(1 << irq, &irq_banks[0], INTC_MIR_SET0 + offset); intc_bank_write_reg(1 << irq, &irq_banks[0], INTC_MIR_SET0 + offset);
} }
static void omap_unmask_irq(unsigned int irq) static void omap_unmask_irq(struct irq_data *d)
{ {
unsigned int irq = d->irq;
int offset = irq & (~(IRQ_BITS_PER_REG - 1)); int offset = irq & (~(IRQ_BITS_PER_REG - 1));
irq &= (IRQ_BITS_PER_REG - 1); irq &= (IRQ_BITS_PER_REG - 1);
@ -137,17 +139,17 @@ static void omap_unmask_irq(unsigned int irq)
intc_bank_write_reg(1 << irq, &irq_banks[0], INTC_MIR_CLEAR0 + offset); intc_bank_write_reg(1 << irq, &irq_banks[0], INTC_MIR_CLEAR0 + offset);
} }
static void omap_mask_ack_irq(unsigned int irq) static void omap_mask_ack_irq(struct irq_data *d)
{ {
omap_mask_irq(irq); omap_mask_irq(d);
omap_ack_irq(irq); omap_ack_irq(d);
} }
static struct irq_chip omap_irq_chip = { static struct irq_chip omap_irq_chip = {
.name = "INTC", .name = "INTC",
.ack = omap_mask_ack_irq, .irq_ack = omap_mask_ack_irq,
.mask = omap_mask_irq, .irq_mask = omap_mask_irq,
.unmask = omap_unmask_irq, .irq_unmask = omap_unmask_irq,
}; };
static void __init omap_irq_bank_init_one(struct omap_irq_bank *bank) static void __init omap_irq_bank_init_one(struct omap_irq_bank *bank)