diff options
author | qctecmdr <qctecmdr@localhost> | 2021-02-24 02:19:55 -0800 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2021-02-24 02:19:55 -0800 |
commit | 7215d79e77a0e027b6ac0c4849302186307bf18f (patch) | |
tree | c9ce40da01700a2b8a877ad9158f910095ec21b2 /qcom | |
parent | 62c946f577e610fed2626f3fabb2b94fc71b8c79 (diff) | |
parent | 86f50c22565449a93a453e158ed0e89655143b60 (diff) | |
download | devicetree-7215d79e77a0e027b6ac0c4849302186307bf18f.tar.gz |
Merge "ARM: dts: qcom: Enable cpu isolate cooling devices for MSM8917"
Diffstat (limited to 'qcom')
-rw-r--r-- | qcom/msm8917-thermal.dtsi | 60 | ||||
-rw-r--r-- | qcom/msm8937-thermal.dtsi | 115 |
2 files changed, 85 insertions, 90 deletions
diff --git a/qcom/msm8917-thermal.dtsi b/qcom/msm8917-thermal.dtsi index 6fe1977f..9933847c 100644 --- a/qcom/msm8917-thermal.dtsi +++ b/qcom/msm8917-thermal.dtsi @@ -1,5 +1,30 @@ #include <dt-bindings/thermal/thermal.h> +&clock_cpu { + qcom,cpu-isolation { + compatible = "qcom,cpu-isolate"; + cpu0_isolate: cpu0-isolate { + qcom,cpu = <&CPU0>; + #cooling-cells = <2>; + }; + + cpu1_isolate: cpu1-isolate { + qcom,cpu = <&CPU1>; + #cooling-cells = <2>; + }; + + cpu2_isolate: cpu2-isolate { + qcom,cpu = <&CPU2>; + #cooling-cells = <2>; + }; + + cpu3_isolate: cpu3-isolate { + qcom,cpu = <&CPU3>; + #cooling-cells = <2>; + }; + }; +}; + &soc { qmi-tmd-devices { compatible = "qcom,qmi-cooling-devices"; @@ -188,28 +213,7 @@ trip = <&cpu_trip>; cooling-device = <&CPU0 THERMAL_NO_LIMIT - (THERMAL_MAX_LIMIT-1)>; - }; - - cpu1_cdev { - trip = <&cpu_trip>; - cooling-device = - <&CPU1 THERMAL_NO_LIMIT - (THERMAL_MAX_LIMIT-1)>; - }; - - cpu2_cdev { - trip = <&cpu_trip>; - cooling-device = - <&CPU2 THERMAL_NO_LIMIT - (THERMAL_MAX_LIMIT-1)>; - }; - - cpu3_cdev { - trip = <&cpu_trip>; - cooling-device = - <&CPU3 THERMAL_NO_LIMIT - (THERMAL_MAX_LIMIT-1)>; + THERMAL_NO_LIMIT>; }; }; }; @@ -254,8 +258,7 @@ cpu0_cdev { trip = <&apc1_cpu0_trip>; cooling-device = - <&CPU0 THERMAL_MAX_LIMIT - THERMAL_MAX_LIMIT>; + <&cpu0_isolate 1 1>; }; }; }; @@ -277,8 +280,7 @@ cpu1_cdev { trip = <&apc1_cpu1_trip>; cooling-device = - <&CPU1 THERMAL_MAX_LIMIT - THERMAL_MAX_LIMIT>; + <&cpu1_isolate 1 1>; }; }; }; @@ -300,8 +302,7 @@ cpu2_cdev { trip = <&apc1_cpu2_trip>; cooling-device = - <&CPU2 THERMAL_MAX_LIMIT - THERMAL_MAX_LIMIT>; + <&cpu2_isolate 1 1>; }; }; }; @@ -323,8 +324,7 @@ cpu3_cdev { trip = <&apc1_cpu3_trip>; cooling-device = - <&CPU3 THERMAL_MAX_LIMIT - THERMAL_MAX_LIMIT>; + <&cpu3_isolate 1 1>; }; }; }; diff --git a/qcom/msm8937-thermal.dtsi b/qcom/msm8937-thermal.dtsi index b1b40561..28788978 100644 --- a/qcom/msm8937-thermal.dtsi +++ b/qcom/msm8937-thermal.dtsi @@ -1,5 +1,50 @@ #include <dt-bindings/thermal/thermal.h> +&clock_cpu { + qcom,cpu-isolation { + compatible = "qcom,cpu-isolate"; + cpu0_isolate: cpu0-isolate { + qcom,cpu = <&CPU0>; + #cooling-cells = <2>; + }; + + cpu1_isolate: cpu1-isolate { + qcom,cpu = <&CPU1>; + #cooling-cells = <2>; + }; + + cpu2_isolate: cpu2-isolate { + qcom,cpu = <&CPU2>; + #cooling-cells = <2>; + }; + + cpu3_isolate: cpu3-isolate { + qcom,cpu = <&CPU3>; + #cooling-cells = <2>; + }; + + cpu4_isolate: cpu4-isolate { + qcom,cpu = <&CPU4>; + #cooling-cells = <2>; + }; + + cpu5_isolate: cpu5-isolate { + qcom,cpu = <&CPU5>; + #cooling-cells = <2>; + }; + + cpu6_isolate: cpu6-isolate { + qcom,cpu = <&CPU6>; + #cooling-cells = <2>; + }; + + cpu7_isolate: cpu7-isolate { + qcom,cpu = <&CPU7>; + #cooling-cells = <2>; + }; + }; +}; + &soc { qmi-tmd-devices { compatible = "qcom,qmi-cooling-devices"; @@ -238,56 +283,14 @@ trip = <&cpu_trip>; cooling-device = <&CPU0 THERMAL_NO_LIMIT - (THERMAL_MAX_LIMIT-1)>; - }; - - cpu1_cdev { - trip = <&cpu_trip>; - cooling-device = - <&CPU1 THERMAL_NO_LIMIT - (THERMAL_MAX_LIMIT-1)>; - }; - - cpu2_cdev { - trip = <&cpu_trip>; - cooling-device = - <&CPU2 THERMAL_NO_LIMIT - (THERMAL_MAX_LIMIT-1)>; - }; - - cpu3_cdev { - trip = <&cpu_trip>; - cooling-device = - <&CPU3 THERMAL_NO_LIMIT - (THERMAL_MAX_LIMIT-1)>; + THERMAL_NO_LIMIT>; }; cpu4_cdev { trip = <&cpu_trip>; cooling-device = <&CPU4 THERMAL_NO_LIMIT - (THERMAL_MAX_LIMIT-1)>; - }; - - cpu5_cdev { - trip = <&cpu_trip>; - cooling-device = - <&CPU5 THERMAL_NO_LIMIT - (THERMAL_MAX_LIMIT-1)>; - }; - - cpu6_cdev { - trip = <&cpu_trip>; - cooling-device = - <&CPU6 THERMAL_NO_LIMIT - (THERMAL_MAX_LIMIT-1)>; - }; - - cpu7_cdev { - trip = <&cpu_trip>; - cooling-device = - <&CPU7 THERMAL_NO_LIMIT - (THERMAL_MAX_LIMIT-1)>; + THERMAL_NO_LIMIT>; }; }; }; @@ -310,8 +313,7 @@ cpu0_cdev { trip = <&apc1_cpu0_trip>; cooling-device = - <&CPU0 THERMAL_MAX_LIMIT - THERMAL_MAX_LIMIT>; + <&cpu0_isolate 1 1>; }; }; }; @@ -334,8 +336,7 @@ cpu1_cdev { trip = <&apc1_cpu1_trip>; cooling-device = - <&CPU1 THERMAL_MAX_LIMIT - THERMAL_MAX_LIMIT>; + <&cpu1_isolate 1 1>; }; }; }; @@ -358,8 +359,7 @@ cpu2_cdev { trip = <&apc1_cpu2_trip>; cooling-device = - <&CPU2 THERMAL_MAX_LIMIT - THERMAL_MAX_LIMIT>; + <&cpu2_isolate 1 1>; }; }; }; @@ -382,8 +382,7 @@ cpu3_cdev { trip = <&apc1_cpu3_trip>; cooling-device = - <&CPU3 THERMAL_MAX_LIMIT - THERMAL_MAX_LIMIT>; + <&cpu3_isolate 1 1>; }; }; }; @@ -406,29 +405,25 @@ cpu4_cdev { trip = <&cpuss0_step_trip>; cooling-device = - <&CPU4 THERMAL_MAX_LIMIT - THERMAL_MAX_LIMIT>; + <&cpu4_isolate 1 1>; }; cpu5_cdev { trip = <&cpuss0_step_trip>; cooling-device = - <&CPU5 THERMAL_MAX_LIMIT - THERMAL_MAX_LIMIT>; + <&cpu5_isolate 1 1>; }; cpu6_cdev { trip = <&cpuss0_step_trip>; cooling-device = - <&CPU6 THERMAL_MAX_LIMIT - THERMAL_MAX_LIMIT>; + <&cpu6_isolate 1 1>; }; cpu7_cdev { trip = <&cpuss0_step_trip>; cooling-device = - <&CPU7 THERMAL_MAX_LIMIT - THERMAL_MAX_LIMIT>; + <&cpu7_isolate 1 1>; }; }; }; |