diff options
| author | Jason Cooper <jason@lakedaemon.net> | 2015-04-10 22:57:56 +0000 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2015-04-10 22:57:56 +0000 |
| commit | 07c523f1493b6860662e74a3d7e1ae0e7d67d416 (patch) | |
| tree | 8d8edfc4f8ba1c985e1b8ca032beadf04323cc01 /arch/arm/boot/dts/dra74x.dtsi | |
| parent | 37b25fffd1435dd9b77ac5882a6791f7d5691097 (diff) | |
| parent | 7136d457f365ecc93ddffcdd42ab49a8473f260b (diff) | |
Merge branch 'irqchip/stacked-omap' into irqchip/core
Diffstat (limited to 'arch/arm/boot/dts/dra74x.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/dra74x.dtsi | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/dra74x.dtsi b/arch/arm/boot/dts/dra74x.dtsi index 10173fab1a15..00eeed789b4b 100644 --- a/arch/arm/boot/dts/dra74x.dtsi +++ b/arch/arm/boot/dts/dra74x.dtsi @@ -41,8 +41,9 @@ pmu { compatible = "arm,cortex-a15-pmu"; - interrupts = <GIC_SPI DIRECT_IRQ(131) IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI DIRECT_IRQ(132) IRQ_TYPE_LEVEL_HIGH>; + interrupt-parent = <&wakeupgen>; + interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 132 IRQ_TYPE_LEVEL_HIGH>; }; ocp { |