FVP: update device tree idle state entries

Device tree idle state bindings changed in kernel v3.18. This patch
updates the FVP DT files to use PSCI suspend as idle state.

The patch also updates the 'compatible' property in the PSCI node
and the 'entry-method' property in the idle-states node in the FVP
Foundation GICv2-legacy device tree.

Change-Id: Ie921d497c579f425c03d482f9d7b90e166106e2f

diff --git a/fdts/fvp-base-gicv2-psci.dtb b/fdts/fvp-base-gicv2-psci.dtb
index b8a31ce33beabb6165c45eaa796d1de07131986f..89318c1874f35951c1ee93c7ca6c219808045294 100644 (file)
Binary files a/fdts/fvp-base-gicv2-psci.dtb and b/fdts/fvp-base-gicv2-psci.dtb differ

diff --git a/fdts/fvp-base-gicv2-psci.dts b/fdts/fvp-base-gicv2-psci.dts
index c1c9efbf15d0c3399b5ef4300b77b55a385609aa..1d26541c3a060b85c4e796a48ca50389e20a6a1d 100644 (file)
--- a/fdts/fvp-base-gicv2-psci.dts
+++ b/fdts/fvp-base-gicv2-psci.dts
@@ -102,7 +102,8 @@
 
                        CPU_SLEEP_0: cpu-sleep-0 {
                                compatible = "arm,idle-state";
-                               entry-method-param = <0x0010000>;
+                               local-timer-stop;
+                               arm,psci-suspend-param = <0x0010000>;
                                entry-latency-us = <40>;
                                exit-latency-us = <100>;
                                min-residency-us = <150>;
@@ -110,7 +111,8 @@
 
                        CLUSTER_SLEEP_0: cluster-sleep-0 {
                                compatible = "arm,idle-state";
-                               entry-method-param = <0x1010000>;
+                               local-timer-stop;
+                               arm,psci-suspend-param = <0x1010000>;
                                entry-latency-us = <500>;
                                exit-latency-us = <1000>;
                                min-residency-us = <2500>;

diff --git a/fdts/fvp-base-gicv2legacy-psci.dtb b/fdts/fvp-base-gicv2legacy-psci.dtb
index 4270623b56a3c3eaf132bea4ea3cb5b91af71465..0d176201d72dcaf4d40573220e9750ecb03dac0e 100644 (file)
Binary files a/fdts/fvp-base-gicv2legacy-psci.dtb and b/fdts/fvp-base-gicv2legacy-psci.dtb differ

diff --git a/fdts/fvp-base-gicv2legacy-psci.dts b/fdts/fvp-base-gicv2legacy-psci.dts
index 7bd5ea268199aaa16849e0e1ca480026ed3c22a4..58d31593289bb040025f8506b644396d101de7ab 100644 (file)
--- a/fdts/fvp-base-gicv2legacy-psci.dts
+++ b/fdts/fvp-base-gicv2legacy-psci.dts
@@ -102,7 +102,8 @@
 
                        CPU_SLEEP_0: cpu-sleep-0 {
                                compatible = "arm,idle-state";
-                               entry-method-param = <0x0010000>;
+                               local-timer-stop;
+                               arm,psci-suspend-param = <0x0010000>;
                                entry-latency-us = <40>;
                                exit-latency-us = <100>;
                                min-residency-us = <150>;
@@ -110,7 +111,8 @@
 
                        CLUSTER_SLEEP_0: cluster-sleep-0 {
                                compatible = "arm,idle-state";
-                               entry-method-param = <0x1010000>;
+                               local-timer-stop;
+                               arm,psci-suspend-param = <0x1010000>;
                                entry-latency-us = <500>;
                                exit-latency-us = <1000>;
                                min-residency-us = <2500>;

diff --git a/fdts/fvp-base-gicv3-psci.dtb b/fdts/fvp-base-gicv3-psci.dtb
index 27c3f9353ba97a34e087cb1a299ceaf62501b84b..f1dc75eeb8b7cac39a82f0f5db655473a4dbd501 100644 (file)
Binary files a/fdts/fvp-base-gicv3-psci.dtb and b/fdts/fvp-base-gicv3-psci.dtb differ

diff --git a/fdts/fvp-base-gicv3-psci.dts b/fdts/fvp-base-gicv3-psci.dts
index 32e577ada7c8fb3a9a5360034b57d3285437c8dd..da090f5c32ead1216d3dfb482bbea564ca2fe5a7 100644 (file)
--- a/fdts/fvp-base-gicv3-psci.dts
+++ b/fdts/fvp-base-gicv3-psci.dts
@@ -100,7 +100,8 @@
 
                        CPU_SLEEP_0: cpu-sleep-0 {
                                compatible = "arm,idle-state";
-                               entry-method-param = <0x0010000>;
+                               local-timer-stop;
+                               arm,psci-suspend-param = <0x0010000>;
                                entry-latency-us = <40>;
                                exit-latency-us = <100>;
                                min-residency-us = <150>;
@@ -108,7 +109,8 @@
 
                        CLUSTER_SLEEP_0: cluster-sleep-0 {
                                compatible = "arm,idle-state";
-                               entry-method-param = <0x1010000>;
+                               local-timer-stop;
+                               arm,psci-suspend-param = <0x1010000>;
                                entry-latency-us = <500>;
                                exit-latency-us = <1000>;
                                min-residency-us = <2500>;

diff --git a/fdts/fvp-foundation-gicv2-psci.dtb b/fdts/fvp-foundation-gicv2-psci.dtb
index 5b92e5ee8288926bd72503e35def261ed4b3f189..e45791813acf9562a198dd8ba4fc24c772867e92 100644 (file)
Binary files a/fdts/fvp-foundation-gicv2-psci.dtb and b/fdts/fvp-foundation-gicv2-psci.dtb differ

diff --git a/fdts/fvp-foundation-gicv2-psci.dts b/fdts/fvp-foundation-gicv2-psci.dts
index c04d535f29c3c142178d9fe9e14ca64a4a4beda7..5f93daa278082170f616df6c02c7b56a3a9025f8 100644 (file)
--- a/fdts/fvp-foundation-gicv2-psci.dts
+++ b/fdts/fvp-foundation-gicv2-psci.dts
@@ -87,7 +87,8 @@
 
                        CPU_SLEEP_0: cpu-sleep-0 {
                                compatible = "arm,idle-state";
-                               entry-method-param = <0x0010000>;
+                               local-timer-stop;
+                               arm,psci-suspend-param = <0x0010000>;
                                entry-latency-us = <40>;
                                exit-latency-us = <100>;
                                min-residency-us = <150>;
@@ -95,7 +96,8 @@
 
                        CLUSTER_SLEEP_0: cluster-sleep-0 {
                                compatible = "arm,idle-state";
-                               entry-method-param = <0x1010000>;
+                               local-timer-stop;
+                               arm,psci-suspend-param = <0x1010000>;
                                entry-latency-us = <500>;
                                exit-latency-us = <1000>;
                                min-residency-us = <2500>;

diff --git a/fdts/fvp-foundation-gicv2legacy-psci.dtb b/fdts/fvp-foundation-gicv2legacy-psci.dtb
index 71f6ae2c9cfc907e6fd60d715ca0e7c6d5533213..ac7555d91ec1dc00d75f0fe190746308a8cc9635 100644 (file)
Binary files a/fdts/fvp-foundation-gicv2legacy-psci.dtb and b/fdts/fvp-foundation-gicv2legacy-psci.dtb differ

diff --git a/fdts/fvp-foundation-gicv2legacy-psci.dts b/fdts/fvp-foundation-gicv2legacy-psci.dts
index 8dba04c1e2b0b38082c94db2b77284c8a2711fc0..4238b3307401abd4c94dcc0fd3039b6d39abcd80 100644 (file)
--- a/fdts/fvp-foundation-gicv2legacy-psci.dts
+++ b/fdts/fvp-foundation-gicv2legacy-psci.dts
@@ -52,7 +52,7 @@
        };
 
        psci {
-               compatible = "arm,psci";
+               compatible = "arm,psci-1.0", "arm,psci-0.2", "arm,psci";
                method = "smc";
                cpu_suspend = <0xc4000001>;
                cpu_off = <0x84000002>;
@@ -83,11 +83,12 @@
                };
 
                idle-states {
-                       entry-method = "arm,psci-1.0", "arm,psci-0.2", "arm,psci";
+                       entry-method = "arm,psci";
 
                        CPU_SLEEP_0: cpu-sleep-0 {
                                compatible = "arm,idle-state";
-                               entry-method-param = <0x0010000>;
+                               local-timer-stop;
+                               arm,psci-suspend-param = <0x0010000>;
                                entry-latency-us = <40>;
                                exit-latency-us = <100>;
                                min-residency-us = <150>;
@@ -95,7 +96,8 @@
 
                        CLUSTER_SLEEP_0: cluster-sleep-0 {
                                compatible = "arm,idle-state";
-                               entry-method-param = <0x1010000>;
+                               local-timer-stop;
+                               arm,psci-suspend-param = <0x1010000>;
                                entry-latency-us = <500>;
                                exit-latency-us = <1000>;
                                min-residency-us = <2500>;

diff --git a/fdts/fvp-foundation-gicv3-psci.dtb b/fdts/fvp-foundation-gicv3-psci.dtb
index d7d9e1412ca6ef9c100db1682a1999a1309c9ec2..f3e0c5d3aa0b47bdb278d044f3f010b382336eab 100644 (file)
Binary files a/fdts/fvp-foundation-gicv3-psci.dtb and b/fdts/fvp-foundation-gicv3-psci.dtb differ

diff --git a/fdts/fvp-foundation-gicv3-psci.dts b/fdts/fvp-foundation-gicv3-psci.dts
index 48a1afc061410f7c1aec14d62cc66c959e803566..daad1fbcee8c3be3ea4549eeacd7a523c9d8fdf5 100644 (file)
--- a/fdts/fvp-foundation-gicv3-psci.dts
+++ b/fdts/fvp-foundation-gicv3-psci.dts
@@ -85,7 +85,8 @@
 
                        CPU_SLEEP_0: cpu-sleep-0 {
                                compatible = "arm,idle-state";
-                               entry-method-param = <0x0010000>;
+                               local-timer-stop;
+                               arm,psci-suspend-param = <0x0010000>;
                                entry-latency-us = <40>;
                                exit-latency-us = <100>;
                                min-residency-us = <150>;
@@ -93,7 +94,8 @@
 
                        CLUSTER_SLEEP_0: cluster-sleep-0 {
                                compatible = "arm,idle-state";
-                               entry-method-param = <0x1010000>;
+                               local-timer-stop;
+                               arm,psci-suspend-param = <0x1010000>;
                                entry-latency-us = <500>;
                                exit-latency-us = <1000>;
                                min-residency-us = <2500>;