Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1260093

[GIT pull] irq fixes for 4.3

Show all headers | View raw

Linus,

please pull the latest irq-urgent-for-linus git tree from:

   git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq-urgent-for-linus

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

Thanks,

	tglx

------------------>
Lucas Stach (1):
      irqchip/tegra: Propagate IRQ type setting to parent

Thomas Petazzoni (1):
      irqchip/armada-370-xp: Fix regression by clearing IRQ_NOAUTOEN


 drivers/irqchip/irq-armada-370-xp.c | 1 +
 drivers/irqchip/irq-tegra.c         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-armada-370-xp.c
index 655cb967a1f2..389318a3be82 100644
--- a/drivers/irqchip/irq-armada-370-xp.c
+++ b/drivers/irqchip/irq-armada-370-xp.c
@@ -317,6 +317,7 @@ static int armada_370_xp_mpic_irq_map(struct irq_domain *h,
 					handle_level_irq);
 	}
 	irq_set_probe(virq);
+	irq_clear_status_flags(virq, IRQ_NOAUTOEN);
 
 	return 0;
 }
diff --git a/drivers/irqchip/irq-tegra.c b/drivers/irqchip/irq-tegra.c
index 2fd89eb88f3a..fd88e687791a 100644
--- a/drivers/irqchip/irq-tegra.c
+++ b/drivers/irqchip/irq-tegra.c
@@ -214,6 +214,7 @@ static struct irq_chip tegra_ictlr_chip = {
 	.irq_unmask		= tegra_unmask,
 	.irq_retrigger		= tegra_retrigger,
 	.irq_set_wake		= tegra_set_wake,
+	.irq_set_type		= irq_chip_set_type_parent,
 	.flags			= IRQCHIP_MASK_ON_SUSPEND,
 #ifdef CONFIG_SMP
 	.irq_set_affinity	= irq_chip_set_affinity_parent,
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[GIT pull] irq fixes for 4.3 Thomas Gleixner <tglx@linutronix.de> - 2015-11-01 09:10 +0100

csiph-web