diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-04-11 12:17:28 +0300 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-04-11 12:17:28 +0300 |
| commit | b7dccbea6b079be01e07921264709f249009b8e8 (patch) | |
| tree | 25997ac6fb2741fb310cf03ebbdb79014fbbd238 /arch/arm/boot/dts/dra7-evm.dts | |
| parent | 425b655ce479843abae07bf4dc7c496ca9538a5a (diff) | |
| parent | a01e7b3258bea93fbf1f028fab1c739d80c61823 (diff) | |
| download | linux-b7dccbea6b079be01e07921264709f249009b8e8.tar.xz | |
Merge tag 'irqchip-core-4.1-3' of git://git.infradead.org/users/jcooper/linux into irq/core
irqchip core change for v4.1 (round 3) from Jason Cooper
Purge the gic_arch_extn hacks and abuse by using the new stacked domains
NOTE: Due to the nature of these changes, patches crossing subsystems have
been kept together in their own branches.
- tegra
- Handle the LIC properly
- omap
- Convert crossbar to stacked domains
- kill arm,routable-irqs in GIC binding
- exynos
- Convert PMU wakeup to stacked domains
- shmobile, ux500, zynq (irq_set_wake branch)
- Switch from abusing gic_arch_extn to using gic_set_irqchip_flags
Diffstat (limited to 'arch/arm/boot/dts/dra7-evm.dts')
| -rw-r--r-- | arch/arm/boot/dts/dra7-evm.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/dra7-evm.dts b/arch/arm/boot/dts/dra7-evm.dts index 7563d7ce01bb..b1bd06c6c2a8 100644 --- a/arch/arm/boot/dts/dra7-evm.dts +++ b/arch/arm/boot/dts/dra7-evm.dts @@ -444,7 +444,7 @@ status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&uart1_pins>; - interrupts-extended = <&gic GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>, + interrupts-extended = <&crossbar_mpu GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>, <&dra7_pmx_core 0x3e0>; }; |