Pull irq fixes from Thomas Gleixner: "The last two one-liners for 4.3 from the irqchip space: - Regression fix for armada SoC which addresses the fallout from the set_irq_flags() cleanup - Add the missing propagation of the irq_set_type() callback to the parent interrupt controller of the tegra interrupt chip" * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: irqchip/tegra: Propagate IRQ type setting to parent irqchip/armada-370-xp: Fix regression by clearing IRQ_NOAUTOEN
Unified · Split
| @@ -317,6 +317,7 @@ static int armada_370_xp_mpic_irq_map(struct irq_domain *h, · 316 unmodified lines | ||
| 317 | 317 | handle_level_irq); |
| 318 | 318 | } |
| 319 | 319 | irq_set_probe(virq); |
| 320 | + irq_clear_status_flags(virq, IRQ_NOAUTOEN); | |
| 320 | 321 | |
| 321 | 322 | return 0; |
| 322 | 323 | } |
| @@ -214,6 +214,7 @@ static struct irq_chip tegra_ictlr_chip = { · 213 unmodified lines | ||
| 214 | 214 | .irq_unmask = tegra_unmask, |
| 215 | 215 | .irq_retrigger = tegra_retrigger, |
| 216 | 216 | .irq_set_wake = tegra_set_wake, |
| 217 | + .irq_set_type = irq_chip_set_type_parent, | |
| 217 | 218 | .flags = IRQCHIP_MASK_ON_SUSPEND, |
| 218 | 219 | #ifdef CONFIG_SMP |
| 219 | 220 | .irq_set_affinity = irq_chip_set_affinity_parent, |