git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
dra72x.dtsi
diff --git
a/arch/arm/boot/dts/dra72x.dtsi
b/arch/arm/boot/dts/dra72x.dtsi
index 6ac8e36014999991d9ccc08c6ba39771de9cc289..03d742f8d572f10a42e426055f28e550ca8bd7a5 100644
(file)
--- a/
arch/arm/boot/dts/dra72x.dtsi
+++ b/
arch/arm/boot/dts/dra72x.dtsi
@@
-30,6
+30,7
@@
pmu {
compatible = "arm,cortex-a15-pmu";
- interrupts = <GIC_SPI DIRECT_IRQ(131) IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-parent = <&wakeupgen>;
+ interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>;
};
};