Commit 6136f372 authored by Juan Castillo's avatar Juan Castillo Committed by Sandrine Bailleux
Browse files

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
parent 09a81af9
...@@ -102,7 +102,8 @@ ...@@ -102,7 +102,8 @@
CPU_SLEEP_0: cpu-sleep-0 { CPU_SLEEP_0: cpu-sleep-0 {
compatible = "arm,idle-state"; compatible = "arm,idle-state";
entry-method-param = <0x0010000>; local-timer-stop;
arm,psci-suspend-param = <0x0010000>;
entry-latency-us = <40>; entry-latency-us = <40>;
exit-latency-us = <100>; exit-latency-us = <100>;
min-residency-us = <150>; min-residency-us = <150>;
...@@ -110,7 +111,8 @@ ...@@ -110,7 +111,8 @@
CLUSTER_SLEEP_0: cluster-sleep-0 { CLUSTER_SLEEP_0: cluster-sleep-0 {
compatible = "arm,idle-state"; compatible = "arm,idle-state";
entry-method-param = <0x1010000>; local-timer-stop;
arm,psci-suspend-param = <0x1010000>;
entry-latency-us = <500>; entry-latency-us = <500>;
exit-latency-us = <1000>; exit-latency-us = <1000>;
min-residency-us = <2500>; min-residency-us = <2500>;
......
...@@ -102,7 +102,8 @@ ...@@ -102,7 +102,8 @@
CPU_SLEEP_0: cpu-sleep-0 { CPU_SLEEP_0: cpu-sleep-0 {
compatible = "arm,idle-state"; compatible = "arm,idle-state";
entry-method-param = <0x0010000>; local-timer-stop;
arm,psci-suspend-param = <0x0010000>;
entry-latency-us = <40>; entry-latency-us = <40>;
exit-latency-us = <100>; exit-latency-us = <100>;
min-residency-us = <150>; min-residency-us = <150>;
...@@ -110,7 +111,8 @@ ...@@ -110,7 +111,8 @@
CLUSTER_SLEEP_0: cluster-sleep-0 { CLUSTER_SLEEP_0: cluster-sleep-0 {
compatible = "arm,idle-state"; compatible = "arm,idle-state";
entry-method-param = <0x1010000>; local-timer-stop;
arm,psci-suspend-param = <0x1010000>;
entry-latency-us = <500>; entry-latency-us = <500>;
exit-latency-us = <1000>; exit-latency-us = <1000>;
min-residency-us = <2500>; min-residency-us = <2500>;
......
...@@ -100,7 +100,8 @@ ...@@ -100,7 +100,8 @@
CPU_SLEEP_0: cpu-sleep-0 { CPU_SLEEP_0: cpu-sleep-0 {
compatible = "arm,idle-state"; compatible = "arm,idle-state";
entry-method-param = <0x0010000>; local-timer-stop;
arm,psci-suspend-param = <0x0010000>;
entry-latency-us = <40>; entry-latency-us = <40>;
exit-latency-us = <100>; exit-latency-us = <100>;
min-residency-us = <150>; min-residency-us = <150>;
...@@ -108,7 +109,8 @@ ...@@ -108,7 +109,8 @@
CLUSTER_SLEEP_0: cluster-sleep-0 { CLUSTER_SLEEP_0: cluster-sleep-0 {
compatible = "arm,idle-state"; compatible = "arm,idle-state";
entry-method-param = <0x1010000>; local-timer-stop;
arm,psci-suspend-param = <0x1010000>;
entry-latency-us = <500>; entry-latency-us = <500>;
exit-latency-us = <1000>; exit-latency-us = <1000>;
min-residency-us = <2500>; min-residency-us = <2500>;
......
...@@ -87,7 +87,8 @@ ...@@ -87,7 +87,8 @@
CPU_SLEEP_0: cpu-sleep-0 { CPU_SLEEP_0: cpu-sleep-0 {
compatible = "arm,idle-state"; compatible = "arm,idle-state";
entry-method-param = <0x0010000>; local-timer-stop;
arm,psci-suspend-param = <0x0010000>;
entry-latency-us = <40>; entry-latency-us = <40>;
exit-latency-us = <100>; exit-latency-us = <100>;
min-residency-us = <150>; min-residency-us = <150>;
...@@ -95,7 +96,8 @@ ...@@ -95,7 +96,8 @@
CLUSTER_SLEEP_0: cluster-sleep-0 { CLUSTER_SLEEP_0: cluster-sleep-0 {
compatible = "arm,idle-state"; compatible = "arm,idle-state";
entry-method-param = <0x1010000>; local-timer-stop;
arm,psci-suspend-param = <0x1010000>;
entry-latency-us = <500>; entry-latency-us = <500>;
exit-latency-us = <1000>; exit-latency-us = <1000>;
min-residency-us = <2500>; min-residency-us = <2500>;
......
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
}; };
psci { psci {
compatible = "arm,psci"; compatible = "arm,psci-1.0", "arm,psci-0.2", "arm,psci";
method = "smc"; method = "smc";
cpu_suspend = <0xc4000001>; cpu_suspend = <0xc4000001>;
cpu_off = <0x84000002>; cpu_off = <0x84000002>;
...@@ -83,11 +83,12 @@ ...@@ -83,11 +83,12 @@
}; };
idle-states { idle-states {
entry-method = "arm,psci-1.0", "arm,psci-0.2", "arm,psci"; entry-method = "arm,psci";
CPU_SLEEP_0: cpu-sleep-0 { CPU_SLEEP_0: cpu-sleep-0 {
compatible = "arm,idle-state"; compatible = "arm,idle-state";
entry-method-param = <0x0010000>; local-timer-stop;
arm,psci-suspend-param = <0x0010000>;
entry-latency-us = <40>; entry-latency-us = <40>;
exit-latency-us = <100>; exit-latency-us = <100>;
min-residency-us = <150>; min-residency-us = <150>;
...@@ -95,7 +96,8 @@ ...@@ -95,7 +96,8 @@
CLUSTER_SLEEP_0: cluster-sleep-0 { CLUSTER_SLEEP_0: cluster-sleep-0 {
compatible = "arm,idle-state"; compatible = "arm,idle-state";
entry-method-param = <0x1010000>; local-timer-stop;
arm,psci-suspend-param = <0x1010000>;
entry-latency-us = <500>; entry-latency-us = <500>;
exit-latency-us = <1000>; exit-latency-us = <1000>;
min-residency-us = <2500>; min-residency-us = <2500>;
......
...@@ -85,7 +85,8 @@ ...@@ -85,7 +85,8 @@
CPU_SLEEP_0: cpu-sleep-0 { CPU_SLEEP_0: cpu-sleep-0 {
compatible = "arm,idle-state"; compatible = "arm,idle-state";
entry-method-param = <0x0010000>; local-timer-stop;
arm,psci-suspend-param = <0x0010000>;
entry-latency-us = <40>; entry-latency-us = <40>;
exit-latency-us = <100>; exit-latency-us = <100>;
min-residency-us = <150>; min-residency-us = <150>;
...@@ -93,7 +94,8 @@ ...@@ -93,7 +94,8 @@
CLUSTER_SLEEP_0: cluster-sleep-0 { CLUSTER_SLEEP_0: cluster-sleep-0 {
compatible = "arm,idle-state"; compatible = "arm,idle-state";
entry-method-param = <0x1010000>; local-timer-stop;
arm,psci-suspend-param = <0x1010000>;
entry-latency-us = <500>; entry-latency-us = <500>;
exit-latency-us = <1000>; exit-latency-us = <1000>;
min-residency-us = <2500>; min-residency-us = <2500>;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment