From: Juan Castillo Date: Thu, 16 Apr 2015 13:17:49 +0000 (+0100) Subject: FVP: update device tree idle state entries X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=6136f372db1d57c5780aef88d4722a880a927724;p=project%2Fbcm63xx%2Fatf.git 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 b8a31ce3..89318c18 100644 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 c1c9efbf..1d26541c 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 index 4270623b..0d176201 100644 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 7bd5ea26..58d31593 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 index 27c3f935..f1dc75ee 100644 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 32e577ad..da090f5c 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 index 5b92e5ee..e4579181 100644 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 c04d535f..5f93daa2 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 index 71f6ae2c..ac7555d9 100644 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 8dba04c1..4238b330 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 index d7d9e141..f3e0c5d3 100644 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 48a1afc0..daad1fbc 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>;