diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2018-07-19 18:16:01 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2018-07-19 18:16:01 +0200 |
| commit | 246b6472b7dafd839c8fc9d4484f00a0ba5ec4dc (patch) | |
| tree | bfa9ef16ae54f0b8eda888a0d8a3e4f5a52a5055 /drivers | |
| parent | d91cfeb0aa79445fcfa9f523a5b57c5e9f4113ec (diff) | |
| parent | d5fd14803573e57941100d11dd9cf3e84d17e180 (diff) | |
| download | linux-246b6472b7dafd839c8fc9d4484f00a0ba5ec4dc.tar.bz2 | |
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/irqchip/irq-ingenic.c | 1 | ||||
| -rw-r--r-- | drivers/irqchip/irq-stm32-exti.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/irqchip/irq-ingenic.c b/drivers/irqchip/irq-ingenic.c index fc5953dea509..2ff08986b536 100644 --- a/drivers/irqchip/irq-ingenic.c +++ b/drivers/irqchip/irq-ingenic.c @@ -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) diff --git a/drivers/irqchip/irq-stm32-exti.c b/drivers/irqchip/irq-stm32-exti.c index 3a7e8905a97e..3df527fcf4e1 100644 --- a/drivers/irqchip/irq-stm32-exti.c +++ b/drivers/irqchip/irq-stm32-exti.c @@ -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 }, |