diff options
author | Juan Castillo <juan.castillo@arm.com> | 2015-04-16 14:17:49 +0100 |
---|---|---|
committer | Sandrine Bailleux <sandrine.bailleux@arm.com> | 2015-04-29 14:57:12 +0100 |
commit | 6136f372db1d57c5780aef88d4722a880a927724 (patch) | |
tree | af9ea6ab20414db30bf50ad492e31282b3894f7a /fdts | |
parent | 09a81af91ec465a89611eb0540e8ba1b74917850 (diff) | |
download | platform_external_arm-trusted-firmware-6136f372db1d57c5780aef88d4722a880a927724.tar.gz platform_external_arm-trusted-firmware-6136f372db1d57c5780aef88d4722a880a927724.tar.bz2 platform_external_arm-trusted-firmware-6136f372db1d57c5780aef88d4722a880a927724.zip |
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
Diffstat (limited to 'fdts')
-rw-r--r-- | fdts/fvp-base-gicv2-psci.dtb | bin | 10106 -> 10151 bytes | |||
-rw-r--r-- | fdts/fvp-base-gicv2-psci.dts | 6 | ||||
-rw-r--r-- | fdts/fvp-base-gicv2legacy-psci.dtb | bin | 10106 -> 10151 bytes | |||
-rw-r--r-- | fdts/fvp-base-gicv2legacy-psci.dts | 6 | ||||
-rw-r--r-- | fdts/fvp-base-gicv3-psci.dtb | bin | 10734 -> 10779 bytes | |||
-rw-r--r-- | fdts/fvp-base-gicv3-psci.dts | 6 | ||||
-rw-r--r-- | fdts/fvp-foundation-gicv2-psci.dtb | bin | 7475 -> 7520 bytes | |||
-rw-r--r-- | fdts/fvp-foundation-gicv2-psci.dts | 6 | ||||
-rw-r--r-- | fdts/fvp-foundation-gicv2legacy-psci.dtb | bin | 7475 -> 7520 bytes | |||
-rw-r--r-- | fdts/fvp-foundation-gicv2legacy-psci.dts | 10 | ||||
-rw-r--r-- | fdts/fvp-foundation-gicv3-psci.dtb | bin | 8103 -> 8148 bytes | |||
-rw-r--r-- | fdts/fvp-foundation-gicv3-psci.dts | 6 |
12 files changed, 26 insertions, 14 deletions
diff --git a/fdts/fvp-base-gicv2-psci.dtb b/fdts/fvp-base-gicv2-psci.dtb Binary files differindex b8a31ce33..89318c187 100644 --- a/fdts/fvp-base-gicv2-psci.dtb +++ b/fdts/fvp-base-gicv2-psci.dtb diff --git a/fdts/fvp-base-gicv2-psci.dts b/fdts/fvp-base-gicv2-psci.dts index c1c9efbf1..1d26541c3 100644 --- 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 Binary files differindex 4270623b5..0d176201d 100644 --- a/fdts/fvp-base-gicv2legacy-psci.dtb +++ b/fdts/fvp-base-gicv2legacy-psci.dtb diff --git a/fdts/fvp-base-gicv2legacy-psci.dts b/fdts/fvp-base-gicv2legacy-psci.dts index 7bd5ea268..58d315932 100644 --- 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 Binary files differindex 27c3f9353..f1dc75eeb 100644 --- a/fdts/fvp-base-gicv3-psci.dtb +++ b/fdts/fvp-base-gicv3-psci.dtb diff --git a/fdts/fvp-base-gicv3-psci.dts b/fdts/fvp-base-gicv3-psci.dts index 32e577ada..da090f5c3 100644 --- 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 Binary files differindex 5b92e5ee8..e45791813 100644 --- a/fdts/fvp-foundation-gicv2-psci.dtb +++ b/fdts/fvp-foundation-gicv2-psci.dtb diff --git a/fdts/fvp-foundation-gicv2-psci.dts b/fdts/fvp-foundation-gicv2-psci.dts index c04d535f2..5f93daa27 100644 --- 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 Binary files differindex 71f6ae2c9..ac7555d91 100644 --- a/fdts/fvp-foundation-gicv2legacy-psci.dtb +++ b/fdts/fvp-foundation-gicv2legacy-psci.dtb diff --git a/fdts/fvp-foundation-gicv2legacy-psci.dts b/fdts/fvp-foundation-gicv2legacy-psci.dts index 8dba04c1e..4238b3307 100644 --- 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 Binary files differindex d7d9e1412..f3e0c5d3a 100644 --- a/fdts/fvp-foundation-gicv3-psci.dtb +++ b/fdts/fvp-foundation-gicv3-psci.dtb diff --git a/fdts/fvp-foundation-gicv3-psci.dts b/fdts/fvp-foundation-gicv3-psci.dts index 48a1afc06..daad1fbce 100644 --- 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>; |