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

Commit 246b6472 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge tag 'irqchip-4.18-3' of... 

Merge tag 'irqchip-4.18-3' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/core

Pull irqchip updates for 4.18, take #3 from Marc Zyngier

 - DT binding updates for Renesas r8a77470 and r8a77980 SoCs
 - DT binding update for Ingenic JZ4725B SoC
 - Fix stm32mp1's exti0 pin routing
parents d91cfeb0 d5fd1480

Documentation/devicetree/bindings/interrupt-controller/ingenic,intc.txt

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ Required properties: 


- compatible : should be "ingenic,<socname>-intc". Valid strings are:

    ingenic,jz4740-intc

    ingenic,jz4725b-intc

    ingenic,jz4770-intc

    ingenic,jz4775-intc

    ingenic,jz4780-intc

Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt

+2 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ Required properties: 
    - "renesas,irqc-r8a73a4" (R-Mobile APE6)

    - "renesas,irqc-r8a7743" (RZ/G1M)

    - "renesas,irqc-r8a7745" (RZ/G1E)

    - "renesas,irqc-r8a77470" (RZ/G1C)

    - "renesas,irqc-r8a7790" (R-Car H2)

    - "renesas,irqc-r8a7791" (R-Car M2-W)

    - "renesas,irqc-r8a7792" (R-Car V2H)
@@ -16,6 +17,7 @@ Required properties: 
    - "renesas,intc-ex-r8a7796" (R-Car M3-W)

    - "renesas,intc-ex-r8a77965" (R-Car M3-N)

    - "renesas,intc-ex-r8a77970" (R-Car V3M)

    - "renesas,intc-ex-r8a77980" (R-Car V3H)

    - "renesas,intc-ex-r8a77995" (R-Car D3)

- #interrupt-cells: has to be <2>: an interrupt index and flags, as defined in

  interrupts.txt in this directory

drivers/irqchip/irq-ingenic.c

+1 −0
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ static int __init intc_1chip_of_init(struct device_node *node, 
	return ingenic_intc_of_init(node, 1);

}

IRQCHIP_DECLARE(jz4740_intc, "ingenic,jz4740-intc", intc_1chip_of_init);

IRQCHIP_DECLARE(jz4725b_intc, "ingenic,jz4725b-intc", intc_1chip_of_init);



static int __init intc_2chip_of_init(struct device_node *node,

	struct device_node *parent)

drivers/irqchip/irq-stm32-exti.c

+1 −0
Original line number Diff line number Diff line
@@ -159,6 +159,7 @@ static const struct stm32_exti_bank *stm32mp1_exti_banks[] = { 
};



static const struct stm32_desc_irq stm32mp1_desc_irq[] = {

	{ .exti = 0, .irq_parent = 6 },

	{ .exti = 1, .irq_parent = 7 },

	{ .exti = 2, .irq_parent = 8 },

	{ .exti = 3, .irq_parent = 9 },