diff options
| author | Jason Cooper <jason@lakedaemon.net> | 2015-12-23 16:09:07 +0000 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2015-12-23 16:09:07 +0000 |
| commit | d8e81cbd80121e6d06dc84076701c603324dd28a (patch) | |
| tree | 8fe1305fbebf258d0fa7cafbc5b85277a3c1714e /drivers/irqchip | |
| parent | 86e57ca735a72b44aab90a649157a678b7069a6d (diff) | |
| parent | bbbb03c1a82eea24e9b15b2f96ecb0cc882ddd2c (diff) | |
| download | linux-d8e81cbd80121e6d06dc84076701c603324dd28a.tar.gz linux-d8e81cbd80121e6d06dc84076701c603324dd28a.tar.bz2 linux-d8e81cbd80121e6d06dc84076701c603324dd28a.zip | |
Merge branch 'irqchip/sunxi' into irqchip/core
Diffstat (limited to 'drivers/irqchip')
| -rw-r--r-- | drivers/irqchip/irq-sunxi-nmi.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/drivers/irqchip/irq-sunxi-nmi.c b/drivers/irqchip/irq-sunxi-nmi.c index 4ef178078e5b..0820f67cc9a7 100644 --- a/drivers/irqchip/irq-sunxi-nmi.c +++ b/drivers/irqchip/irq-sunxi-nmi.c @@ -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); |