diff options
| author | Linaro CI <ci_notify@linaro.org> | 2019-08-13 05:25:55 +0000 |
|---|---|---|
| committer | Linaro CI <ci_notify@linaro.org> | 2019-08-13 05:25:55 +0000 |
| commit | 829f1d4ed8f0394cdf54d199542f2d71f46ca4cc (patch) | |
| tree | 4513b657c040474cd494859b6f33fbaaad1bc9db | |
| parent | a548982dedef886abf206dc22aed357d0ce13388 (diff) | |
| parent | 60566a1d35b2efa56d3c3d315ae89b10ef21ed49 (diff) | |
Merge remote-tracking branch 'cpuidle/wrk3/automerge/idle-branch' into integration-linux-qcomltintegration-linux-qcomlt-20190813-060711-v5.3-rc4-185-g829f1d4ed8f03
# Conflicts:
# arch/arm64/boot/dts/qcom/msm8996.dtsi
| -rw-r--r-- | arch/arm64/boot/dts/qcom/msm8996.dtsi | 43 |
1 files changed, 39 insertions, 4 deletions
diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi index 7d6a7aec882e..e23941ca871b 100644 --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi @@ -89,7 +89,9 @@ compatible = "qcom,kryo"; reg = <0x0 0x0>; enable-method = "psci"; - cpu-idle-states = <&CPU_SLEEP_0>; + cpu-idle-states = <&CPU_SLEEP_0 &CPU_SLEEP_1 + &CLUSTER_SLEEP_0 + &SYSTEM_SLEEP_0>; capacity-dmips-mhz = <1024>; next-level-cache = <&L2_0>; L2_0: l2-cache { @@ -103,7 +105,9 @@ compatible = "qcom,kryo"; reg = <0x0 0x1>; enable-method = "psci"; - cpu-idle-states = <&CPU_SLEEP_0>; + cpu-idle-states = <&CPU_SLEEP_0 &CPU_SLEEP_1 + &CLUSTER_SLEEP_0 + &SYSTEM_SLEEP_0>; capacity-dmips-mhz = <1024>; next-level-cache = <&L2_0>; }; @@ -113,7 +117,9 @@ compatible = "qcom,kryo"; reg = <0x0 0x100>; enable-method = "psci"; - cpu-idle-states = <&CPU_SLEEP_0>; + cpu-idle-states = <&CPU_SLEEP_0 &CPU_SLEEP_1 + &CLUSTER_SLEEP_0 + &SYSTEM_SLEEP_0>; capacity-dmips-mhz = <1024>; next-level-cache = <&L2_1>; L2_1: l2-cache { @@ -127,7 +133,9 @@ compatible = "qcom,kryo"; reg = <0x0 0x101>; enable-method = "psci"; - cpu-idle-states = <&CPU_SLEEP_0>; + cpu-idle-states = <&CPU_SLEEP_0 &CPU_SLEEP_1 + &CLUSTER_SLEEP_0 + &SYSTEM_SLEEP_0>; capacity-dmips-mhz = <1024>; next-level-cache = <&L2_1>; }; @@ -159,12 +167,39 @@ CPU_SLEEP_0: cpu-sleep-0 { compatible = "arm,idle-state"; + idle-state-name = "wfi"; + arm,psci-suspend-param = <0x00000001>; + entry-latency-us = <40>; + exit-latency-us = <80>; + min-residency-us = <300>; + }; + + CPU_SLEEP_1: cpu-sleep-1 { + compatible = "arm,idle-state"; idle-state-name = "standalone-power-collapse"; arm,psci-suspend-param = <0x00000004>; entry-latency-us = <130>; exit-latency-us = <80>; min-residency-us = <300>; }; + + CLUSTER_SLEEP_0: cluster-sleep-0 { + compatible = "arm,idle-state"; + idle-state-name = "pwr-l2-wfi"; + arm,psci-suspend-param = <0x40000001>; + entry-latency-us = <45>; + exit-latency-us = <85>; + min-residency-us = <300>; + }; + + SYSTEM_SLEEP_0: system-sleep-0 { + compatible = "arm,idle-state"; + idle-state-name = "system-wfi"; + arm,psci-suspend-param = <0x40000001>; + entry-latency-us = <20>; + exit-latency-us = <120>; + min-residency-us = <300>; + }; }; }; |