aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVitaly Andrianov2015-01-20 13:13:06 -0600
committerVitaly Andrianov2015-01-20 13:13:06 -0600
commit76161fa9b43c9c10a4a41fe7db333e4afd5e5e3f (patch)
tree6063a7c5d4df7521d6336fda8f17ddf961609a5b
parentbc173c2cc0d61a7f1193794f97abf90405a7830d (diff)
parentc35da60aba3618316693484a03d64b1a23729fdf (diff)
downloadlinux-76161fa9b43c9c10a4a41fe7db333e4afd5e5e3f.tar.gz
linux-76161fa9b43c9c10a4a41fe7db333e4afd5e5e3f.tar.xz
linux-76161fa9b43c9c10a4a41fe7db333e4afd5e5e3f.zip
Merge branch '15-dts' into master2
-rw-r--r--arch/arm/boot/dts/keystone.dtsi8
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/keystone.dtsi b/arch/arm/boot/dts/keystone.dtsi
index 57f7f3d82ea..f2f92391606 100644
--- a/arch/arm/boot/dts/keystone.dtsi
+++ b/arch/arm/boot/dts/keystone.dtsi
@@ -28,6 +28,14 @@
28 reg = <0x00000000 0x80000000 0x00000000 0x20000000>; 28 reg = <0x00000000 0x80000000 0x00000000 0x20000000>;
29 }; 29 };
30 30
31 psci {
32 compatible = "arm,psci";
33 method = "smc";
34 cpu_suspend = <0x84000001>;
35 cpu_off = <0x84000002>;
36 cpu_on = <0x84000003>;
37 };
38
31 soc { 39 soc {
32 #address-cells = <1>; 40 #address-cells = <1>;
33 #size-cells = <1>; 41 #size-cells = <1>;