|
@@ -240,6 +240,7 @@ void irq_setup_generic_chip(struct irq_chip_generic *gc, u32 msk,
|
|
|
unsigned int set)
|
|
|
{
|
|
|
struct irq_chip_type *ct = gc->chip_types;
|
|
|
+ struct irq_chip *chip = &ct->chip;
|
|
|
unsigned int i;
|
|
|
u32 *mskptr = &gc->mask_cache, mskreg = ct->regs.mask;
|
|
|
|
|
@@ -267,9 +268,12 @@ void irq_setup_generic_chip(struct irq_chip_generic *gc, u32 msk,
|
|
|
if (!(flags & IRQ_GC_NO_MASK)) {
|
|
|
struct irq_data *d = irq_get_irq_data(i);
|
|
|
|
|
|
- d->mask = 1 << (i - gc->irq_base);
|
|
|
+ if (chip->irq_calc_mask)
|
|
|
+ chip->irq_calc_mask(d);
|
|
|
+ else
|
|
|
+ d->mask = 1 << (i - gc->irq_base);
|
|
|
}
|
|
|
- irq_set_chip_and_handler(i, &ct->chip, ct->handler);
|
|
|
+ irq_set_chip_and_handler(i, chip, ct->handler);
|
|
|
irq_set_chip_data(i, gc);
|
|
|
irq_modify_status(i, clr, set);
|
|
|
}
|