Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4bf690d7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

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
parents 56ef9db2 209da391

drivers/irqchip/irq-armada-370-xp.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -317,6 +317,7 @@ static int armada_370_xp_mpic_irq_map(struct irq_domain *h, 
					handle_level_irq);

					handle_level_irq);

	}

	}

	irq_set_probe(virq);

	irq_set_probe(virq);

	irq_clear_status_flags(virq, IRQ_NOAUTOEN);





	return 0;

	return 0;

}

}

drivers/irqchip/irq-tegra.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -214,6 +214,7 @@ static struct irq_chip tegra_ictlr_chip = { 
	.irq_unmask		= tegra_unmask,

	.irq_unmask		= tegra_unmask,

	.irq_retrigger		= tegra_retrigger,

	.irq_retrigger		= tegra_retrigger,

	.irq_set_wake		= tegra_set_wake,

	.irq_set_wake		= tegra_set_wake,

	.irq_set_type		= irq_chip_set_type_parent,

	.flags			= IRQCHIP_MASK_ON_SUSPEND,

	.flags			= IRQCHIP_MASK_ON_SUSPEND,

#ifdef CONFIG_SMP

#ifdef CONFIG_SMP

	.irq_set_affinity	= irq_chip_set_affinity_parent,

	.irq_set_affinity	= irq_chip_set_affinity_parent,