Commit f94f87ab authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge branch 'irq/urgent' into irq/core 

Get the urgent bugfix for aic5 as further patches depend on it.
parents afbbd233 d32dc9aa

drivers/irqchip/irq-atmel-aic5.c

+16 −8
Original line number Diff line number Diff line
@@ -88,28 +88,36 @@ static void aic5_mask(struct irq_data *d) 
{

	struct irq_domain *domain = d->domain;

	struct irq_domain_chip_generic *dgc = domain->gc;

	struct irq_chip_generic *gc = dgc->gc[0];

	struct irq_chip_generic *bgc = dgc->gc[0];

	struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);



	/* Disable interrupt on AIC5 */

	irq_gc_lock(gc);

	/*

	 * Disable interrupt on AIC5. We always take the lock of the

	 * first irq chip as all chips share the same registers.

	 */

	irq_gc_lock(bgc);

	irq_reg_writel(gc, d->hwirq, AT91_AIC5_SSR);

	irq_reg_writel(gc, 1, AT91_AIC5_IDCR);

	gc->mask_cache &= ~d->mask;

	irq_gc_unlock(gc);

	irq_gc_unlock(bgc);

}



static void aic5_unmask(struct irq_data *d)

{

	struct irq_domain *domain = d->domain;

	struct irq_domain_chip_generic *dgc = domain->gc;

	struct irq_chip_generic *gc = dgc->gc[0];

	struct irq_chip_generic *bgc = dgc->gc[0];

	struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);



	/* Enable interrupt on AIC5 */

	irq_gc_lock(gc);

	/*

	 * Enable interrupt on AIC5. We always take the lock of the

	 * first irq chip as all chips share the same registers.

	 */

	irq_gc_lock(bgc);

	irq_reg_writel(gc, d->hwirq, AT91_AIC5_SSR);

	irq_reg_writel(gc, 1, AT91_AIC5_IECR);

	gc->mask_cache |= d->mask;

	irq_gc_unlock(gc);

	irq_gc_unlock(bgc);

}



static int aic5_retrigger(struct irq_data *d)