[PATCH v6 2/9] irqchip/sunxi-nmi: add support for the NMI in A64 R_INTC
From: Marc Zyngier <hidden>
Date: 2017-05-22 09:39:29
Also in:
linux-devicetree, lkml
On 18/05/17 08:16, Icenowy Zheng wrote:
quoted hunk ↗ jump to hunk
Add support for the newly imported compatible for the A64 R_INTC in irq-sunxi-nmi driver. Signed-off-by: Icenowy Zheng <icenowy@aosc.io> --- Changes in v5: - Fix A64 R_INTC compatible. drivers/irqchip/irq-sunxi-nmi.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)diff --git a/drivers/irqchip/irq-sunxi-nmi.c b/drivers/irqchip/irq-sunxi-nmi.c index 668730c5cb66..5559c1d593bf 100644 --- a/drivers/irqchip/irq-sunxi-nmi.c +++ b/drivers/irqchip/irq-sunxi-nmi.c@@ -56,6 +56,12 @@ static struct sunxi_sc_nmi_reg_offs sun9i_reg_offs = { .enable = 0x04, }; +static struct sunxi_sc_nmi_reg_offs sun50i_reg_offs = { + .ctrl = 0x0c, + .pend = 0x10, + .enable = 0x40, +}; +
Magic values? Even if no #define is provided, a pointer to the corresponding documentation would be appreciated (assuming documentation exists).
quoted hunk ↗ jump to hunk
static inline void sunxi_sc_nmi_write(struct irq_chip_generic *gc, u32 off, u32 val) {@@ -220,3 +226,10 @@ static int __init sun9i_nmi_irq_init(struct device_node *node, return sunxi_sc_nmi_irq_init(node, &sun9i_reg_offs); } IRQCHIP_DECLARE(sun9i_nmi, "allwinner,sun9i-a80-nmi", sun9i_nmi_irq_init); + +static int __init sun50i_nmi_irq_init(struct device_node *node, + struct device_node *parent) +{ + return sunxi_sc_nmi_irq_init(node, &sun50i_reg_offs); +} +IRQCHIP_DECLARE(sun50i_nmi, "allwinner,sun50i-a64-r-intc", sun50i_nmi_irq_init);
Apart from the above: Acked-by: Marc Zyngier <redacted> Let me know how you want this to be merged. Thanks, M. -- Jazz is not dead. It just smells funny...