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

Commit d8e81cbd authored by Jason Cooper's avatar Jason Cooper
Browse files

Merge branch 'irqchip/sunxi' into irqchip/core

parents 86e57ca7 bbbb03c1

Documentation/devicetree/bindings/interrupt-controller/allwinner,sun67i-sc-nmi.txt→Documentation/devicetree/bindings/interrupt-controller/allwinner,sunxi-nmi.txt

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ Allwinner Sunxi NMI Controller 
Required properties:



- compatible : should be "allwinner,sun7i-a20-sc-nmi" or

  "allwinner,sun6i-a31-sc-nmi"

  "allwinner,sun6i-a31-sc-nmi" or "allwinner,sun9i-a80-nmi"

- reg : Specifies base physical address and size of the registers.

- interrupt-controller : Identifies the node as an interrupt controller

- #interrupt-cells : Specifies the number of cells needed to encode an

drivers/irqchip/irq-sunxi-nmi.c

+13 −0
Original line number Diff line number Diff line
@@ -50,6 +50,12 @@ static struct sunxi_sc_nmi_reg_offs sun6i_reg_offs = { 
	.enable	= 0x34,

};



static struct sunxi_sc_nmi_reg_offs sun9i_reg_offs = {

	.ctrl	= 0x00,

	.pend	= 0x08,

	.enable	= 0x04,

};



static inline void sunxi_sc_nmi_write(struct irq_chip_generic *gc, u32 off,

				      u32 val)

{
@@ -207,3 +213,10 @@ static int __init sun7i_sc_nmi_irq_init(struct device_node *node, 
	return sunxi_sc_nmi_irq_init(node, &sun7i_reg_offs);

}

IRQCHIP_DECLARE(sun7i_sc_nmi, "allwinner,sun7i-a20-sc-nmi", sun7i_sc_nmi_irq_init);



static int __init sun9i_nmi_irq_init(struct device_node *node,

				     struct device_node *parent)

{

	return sunxi_sc_nmi_irq_init(node, &sun9i_reg_offs);

}

IRQCHIP_DECLARE(sun9i_nmi, "allwinner,sun9i-a80-nmi", sun9i_nmi_irq_init);