Commit dde5cfff authored by Marc Zyngier's avatar Marc Zyngier
Browse files

Merge branch 'irq/irqchip-fixes' into irq/irqchip-next 



Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parents 408f110e 1d1e5630

drivers/irqchip/irq-loongson-htvec.c

+2 −2
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ static void htvec_reset(struct htvec *priv) 
	/* Clear IRQ cause registers, mask all interrupts */

	for (idx = 0; idx < priv->num_parents; idx++) {

		writel_relaxed(0x0, priv->base + HTVEC_EN_OFF + 4 * idx);

		writel_relaxed(0xFFFFFFFF, priv->base);

		writel_relaxed(0xFFFFFFFF, priv->base + 4 * idx);

	}

}
@@ -172,7 +172,7 @@ static int htvec_of_init(struct device_node *node, 
		goto free_priv;

	}



	/* Interrupt may come from any of the 4 interrupt line */

	/* Interrupt may come from any of the 8 interrupt lines */

	for (i = 0; i < HTVEC_MAX_PARENT_IRQ; i++) {

		parent_irq[i] = irq_of_parse_and_map(node, i);

		if (parent_irq[i] <= 0)

drivers/irqchip/irq-ti-sci-inta.c

+2 −2
Original line number Diff line number Diff line
@@ -175,8 +175,8 @@ static struct ti_sci_inta_vint_desc *ti_sci_inta_alloc_parent_irq(struct irq_dom 
	struct irq_fwspec parent_fwspec;

	struct device_node *parent_node;

	unsigned int parent_virq;

	u16 vint_id, p_hwirq;

	int ret;

	int p_hwirq, ret;

	u16 vint_id;



	vint_id = ti_sci_get_free_resource(inta->vint);

	if (vint_id == TI_SCI_RESOURCE_NULL)

drivers/irqchip/irq-ti-sci-intr.c

+2 −2
Original line number Diff line number Diff line
@@ -137,8 +137,8 @@ static int ti_sci_intr_alloc_parent_irq(struct irq_domain *domain, 
	struct ti_sci_intr_irq_domain *intr = domain->host_data;

	struct device_node *parent_node;

	struct irq_fwspec fwspec;

	u16 out_irq, p_hwirq;

	int err = 0;

	int p_hwirq, err = 0;

	u16 out_irq;



	out_irq = ti_sci_get_free_resource(intr->out_irqs);

	if (out_irq == TI_SCI_RESOURCE_NULL)