diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2017-06-23 15:26:29 +0300 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-06-23 15:26:29 +0300 |
| commit | 8d9d51b62e8558bbc11c6b978acad001f9ea7a42 (patch) | |
| tree | 8ca3c44dd7401d0bcc42f21a93876715e2be5f4b /drivers/irqchip/irq-aspeed-vic.c | |
| parent | 6a6544e520abecd484ab8b67fb50d1fc003f3275 (diff) | |
| parent | 6c31e123dc4c59eeaae6ac1cd08b929e8b6f7651 (diff) | |
| download | linux-8d9d51b62e8558bbc11c6b978acad001f9ea7a42.tar.xz | |
Merge tag 'irqchip-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/core
Pull irqchip updates for v4.13 from Marc Zyngier
- support for the new Marvell wire-to-MSI bridge
- support for the Aspeed I2C irqchip
- Armada XP370 per-cpu interrupt fixes
- GICv3 ITS ACPI NUMA support
- sunxi-nmi cleanup and updates for new platform support
- various GICv3 ITS cleanups and fixes
- some constifying in various places
Diffstat (limited to 'drivers/irqchip/irq-aspeed-vic.c')
| -rw-r--r-- | drivers/irqchip/irq-aspeed-vic.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/irqchip/irq-aspeed-vic.c b/drivers/irqchip/irq-aspeed-vic.c index d24451d5bf8a..03ba477ea0d0 100644 --- a/drivers/irqchip/irq-aspeed-vic.c +++ b/drivers/irqchip/irq-aspeed-vic.c @@ -186,7 +186,7 @@ static int avic_map(struct irq_domain *d, unsigned int irq, return 0; } -static struct irq_domain_ops avic_dom_ops = { +static const struct irq_domain_ops avic_dom_ops = { .map = avic_map, .xlate = irq_domain_xlate_onetwocell, }; @@ -227,4 +227,5 @@ static int __init avic_of_init(struct device_node *node, return 0; } -IRQCHIP_DECLARE(aspeed_new_vic, "aspeed,ast2400-vic", avic_of_init); +IRQCHIP_DECLARE(ast2400_vic, "aspeed,ast2400-vic", avic_of_init); +IRQCHIP_DECLARE(ast2500_vic, "aspeed,ast2500-vic", avic_of_init); |