diff --git a/qcom/anorak-thermal.dtsi b/qcom/anorak-thermal.dtsi index bddc3b8e..cacd4530 100644 --- a/qcom/anorak-thermal.dtsi +++ b/qcom/anorak-thermal.dtsi @@ -32,46 +32,55 @@ cpu0_pause: cpu0-pause { qcom,cpus = <&CPU0>; + qcom,cdev-alias = "thermal-pause-1"; #cooling-cells = <2>; }; cpu1_pause: cpu1-pause { qcom,cpus = <&CPU1>; + qcom,cdev-alias = "thermal-pause-2"; #cooling-cells = <2>; }; cpu2_pause: cpu2-pause { qcom,cpus = <&CPU2>; + qcom,cdev-alias = "thermal-pause-4"; #cooling-cells = <2>; }; cpu3_pause: cpu3-pause { qcom,cpus = <&CPU3>; + qcom,cdev-alias = "thermal-pause-8"; #cooling-cells = <2>; }; cpu4_pause: cpu4-pause { qcom,cpus = <&CPU4>; + qcom,cdev-alias = "thermal-pause-10"; #cooling-cells = <2>; }; cpu5_pause: cpu5-pause { qcom,cpus = <&CPU5>; + qcom,cdev-alias = "thermal-pause-20"; #cooling-cells = <2>; }; cpu_2_3_pause: cpu_2_3-pause { qcom,cpus = <&CPU2 &CPU3>; + qcom,cdev-alias = "thermal-pause-C"; #cooling-cells = <2>; }; cpu_4_5_pause: cpu_4_5-pause { qcom,cpus = <&CPU4 &CPU5>; + qcom,cdev-alias = "thermal-pause-30"; #cooling-cells = <2>; }; APC1_pause: apc1-pause { qcom,cpus = <&CPU2 &CPU3 &CPU4 &CPU5>; + qcom,cdev-alias = "thermal-pause-3C"; #cooling-cells = <2>; }; @@ -112,31 +121,37 @@ cpu0_hotplug: cpu0-hotplug { qcom,cpu = <&CPU0>; + qcom,cdev-alias = "cpu-hotplug0"; #cooling-cells = <2>; }; cpu1_hotplug: cpu1-hotplug { qcom,cpu = <&CPU1>; + qcom,cdev-alias = "cpu-hotplug1"; #cooling-cells = <2>; }; cpu2_hotplug: cpu2-hotplug { qcom,cpu = <&CPU2>; + qcom,cdev-alias = "cpu-hotplug2"; #cooling-cells = <2>; }; cpu3_hotplug: cpu3-hotplug { qcom,cpu = <&CPU3>; + qcom,cdev-alias = "cpu-hotplug3"; #cooling-cells = <2>; }; cpu4_hotplug: cpu4-hotplug { qcom,cpu = <&CPU4>; + qcom,cdev-alias = "cpu-hotplug4"; #cooling-cells = <2>; }; cpu5_hotplug: cpu5-hotplug { qcom,cpu = <&CPU5>; + qcom,cdev-alias = "cpu-hotplug5"; #cooling-cells = <2>; }; }; @@ -172,7 +187,15 @@ qcom,cpufreq-cdev { compatible = "qcom,cpufreq-cdev"; - qcom,cpus = <&CPU0 &CPU2>; + cpu-cluster0 { + qcom,cpus = <&CPU0 &CPU1>; + }; + + cpu-cluster1 { + qcom,cpus = <&CPU2 &CPU3 &CPU4 &CPU5>; + }; + + }; }; diff --git a/qcom/cape-thermal.dtsi b/qcom/cape-thermal.dtsi index 7c48c28f..83e11666 100644 --- a/qcom/cape-thermal.dtsi +++ b/qcom/cape-thermal.dtsi @@ -32,46 +32,55 @@ cpu0_pause: cpu0-pause { qcom,cpus = <&CPU0>; + qcom,cdev-alias = "thermal-pause-1"; #cooling-cells = <2>; }; cpu1_pause: cpu1-pause { qcom,cpus = <&CPU1>; + qcom,cdev-alias = "thermal-pause-2"; #cooling-cells = <2>; }; cpu2_pause: cpu2-pause { qcom,cpus = <&CPU2>; + qcom,cdev-alias = "thermal-pause-4"; #cooling-cells = <2>; }; cpu3_pause: cpu3-pause { qcom,cpus = <&CPU3>; + qcom,cdev-alias = "thermal-pause-8"; #cooling-cells = <2>; }; cpu5_pause: cpu5-pause { qcom,cpus = <&CPU5>; + qcom,cdev-alias = "thermal-pause-20"; #cooling-cells = <2>; }; cpu6_pause: cpu6-pause { qcom,cpus = <&CPU6>; + qcom,cdev-alias = "thermal-pause-40"; #cooling-cells = <2>; }; cpu7_pause: cpu7-pause { qcom,cpus = <&CPU7>; + qcom,cdev-alias = "thermal-pause-80"; #cooling-cells = <2>; }; APC1_pause: apc1-pause { qcom,cpus = <&CPU5 &CPU6 &CPU7>; + qcom,cdev-alias = "thermal-pause-E0"; #cooling-cells = <2>; }; cpu_6_7_pause: cpu-6-7-pause { qcom,cpus = <&CPU6 &CPU7>; + qcom,cdev-alias = "thermal-pause-C0"; #cooling-cells = <2>; }; @@ -117,44 +126,52 @@ cpu0_hotplug: cpu0-hotplug { qcom,cpu = <&CPU0>; + qcom,cdev-alias = "cpu-hotplug0"; #cooling-cells = <2>; }; cpu1_hotplug: cpu1-hotplug { qcom,cpu = <&CPU1>; + qcom,cdev-alias = "cpu-hotplug1"; #cooling-cells = <2>; }; cpu2_hotplug: cpu2-hotplug { qcom,cpu = <&CPU2>; + qcom,cdev-alias = "cpu-hotplug2"; #cooling-cells = <2>; }; cpu3_hotplug: cpu3-hotplug { qcom,cpu = <&CPU3>; + qcom,cdev-alias = "cpu-hotplug3"; #cooling-cells = <2>; }; cpu5_hotplug: cpu5-hotplug { qcom,cpu = <&CPU5>; + qcom,cdev-alias = "cpu-hotplug5"; #cooling-cells = <2>; }; cpu6_hotplug: cpu6-hotplug { qcom,cpu = <&CPU6>; + qcom,cdev-alias = "cpu-hotplug6"; #cooling-cells = <2>; }; cpu7_hotplug: cpu7-hotplug { qcom,cpu = <&CPU7>; + qcom,cdev-alias = "cpu-hotplug7"; #cooling-cells = <2>; }; }; qcom,cpu-voltage-cdev { compatible = "qcom,cc-cooling-devices"; - apc1_cluster: qcom,apc1-cluster { - qcom,cpus = <&CPU4 &CPU7>; + apc1_cluster: thermal-cluster-4-7 { + qcom,cluster0 = <&CPU4 &CPU5 &CPU6>; + qcom,cluster1 = <&CPU7>; #cooling-cells = <2>; }; }; @@ -205,7 +222,17 @@ qcom,cpufreq-cdev { compatible = "qcom,cpufreq-cdev"; - qcom,cpus = <&CPU0 &CPU4 &CPU7>; + cpu-cluster0 { + qcom,cpus = <&CPU0 &CPU1 &CPU2 &CPU3>; + }; + + cpu-cluster1 { + qcom,cpus = <&CPU4 &CPU5 &CPU6>; + }; + + cpu-cluster2 { + qcom,cpus = <&CPU7>; + }; }; qcom,devfreq-cdev { @@ -1082,12 +1109,24 @@ }; cooling-maps { - gold_cdev { + gold_cdev0 { trip = <&ddr_config0>; cooling-device = <&CPU4 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; }; + gold_cdev1 { + trip = <&ddr_config0>; + cooling-device = <&CPU5 + THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + }; + + gold_cdev2 { + trip = <&ddr_config0>; + cooling-device = <&CPU6 + THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + }; + gold_plus_cdev { trip = <&ddr_config0>; cooling-device = <&CPU7 diff --git a/qcom/diwali-thermal-overlay.dtsi b/qcom/diwali-thermal-overlay.dtsi index c6ecf4da..19cf3ac3 100644 --- a/qcom/diwali-thermal-overlay.dtsi +++ b/qcom/diwali-thermal-overlay.dtsi @@ -109,6 +109,16 @@ cooling-device = <&CPU4 0 THERMAL_NO_LIMIT>; }; + pm7325_cpu5_freq { + trip = <&pm7325_trip0>; + cooling-device = <&CPU5 10 THERMAL_NO_LIMIT>; + }; + + pm7325_cpu6_freq { + trip = <&pm7325_trip0>; + cooling-device = <&CPU6 10 THERMAL_NO_LIMIT>; + }; + pm7325_cpu7_freq { trip = <&pm7325_trip0>; cooling-device = <&CPU7 0 THERMAL_NO_LIMIT>; diff --git a/qcom/diwali-thermal.dtsi b/qcom/diwali-thermal.dtsi index d291bfa7..f8a51b42 100644 --- a/qcom/diwali-thermal.dtsi +++ b/qcom/diwali-thermal.dtsi @@ -32,56 +32,67 @@ cpu0_pause: cpu0-pause { qcom,cpus = <&CPU0>; + qcom,cdev-alias = "thermal-pause-1"; #cooling-cells = <2>; }; cpu1_pause: cpu1-pause { qcom,cpus = <&CPU1>; + qcom,cdev-alias = "thermal-pause-2"; #cooling-cells = <2>; }; cpu2_pause: cpu2-pause { qcom,cpus = <&CPU2>; + qcom,cdev-alias = "thermal-pause-4"; #cooling-cells = <2>; }; cpu3_pause: cpu3-pause { qcom,cpus = <&CPU3>; + qcom,cdev-alias = "thermal-pause-8"; #cooling-cells = <2>; }; cpu5_pause: cpu5-pause { qcom,cpus = <&CPU5>; + qcom,cdev-alias = "thermal-pause-20"; #cooling-cells = <2>; }; cpu6_pause: cpu6-pause { qcom,cpus = <&CPU6>; + qcom,cdev-alias = "thermal-pause-40"; #cooling-cells = <2>; }; cpu7_pause: cpu7-pause { qcom,cpus = <&CPU7>; + qcom,cdev-alias = "thermal-pause-80"; #cooling-cells = <2>; }; APC1_pause: apc1-pause { qcom,cpus = <&CPU5 &CPU6 &CPU7>; + qcom,cdev-alias = "thermal-pause-E0"; #cooling-cells = <2>; }; cpu_6_7_pause: cpu-6-7-pause { qcom,cpus = <&CPU6 &CPU7>; + qcom,cdev-alias = "thermal-pause-C0"; #cooling-cells = <2>; }; cpu_5_6_pause: cpu-5-6-pause { qcom,cpus = <&CPU5 &CPU6>; + qcom,cdev-alias = "thermal-pause-60"; #cooling-cells = <2>; }; cpu_2_3_7_pause: cpu-2-3-7-pause { qcom,cpus = <&CPU2 &CPU3 &CPU7>; + qcom,cdev-alias = "thermal-pause-8C"; #cooling-cells = <2>; }; @@ -127,44 +138,52 @@ cpu0_hotplug: cpu0-hotplug { qcom,cpu = <&CPU0>; + qcom,cdev-alias = "cpu-hotplug0"; #cooling-cells = <2>; }; cpu1_hotplug: cpu1-hotplug { qcom,cpu = <&CPU1>; + qcom,cdev-alias = "cpu-hotplug1"; #cooling-cells = <2>; }; cpu2_hotplug: cpu2-hotplug { qcom,cpu = <&CPU2>; + qcom,cdev-alias = "cpu-hotplug2"; #cooling-cells = <2>; }; cpu3_hotplug: cpu3-hotplug { qcom,cpu = <&CPU3>; + qcom,cdev-alias = "cpu-hotplug3"; #cooling-cells = <2>; }; cpu5_hotplug: cpu5-hotplug { qcom,cpu = <&CPU5>; + qcom,cdev-alias = "cpu-hotplug5"; #cooling-cells = <2>; }; cpu6_hotplug: cpu6-hotplug { qcom,cpu = <&CPU6>; + qcom,cdev-alias = "cpu-hotplug6"; #cooling-cells = <2>; }; cpu7_hotplug: cpu7-hotplug { qcom,cpu = <&CPU7>; + qcom,cdev-alias = "cpu-hotplug7"; #cooling-cells = <2>; }; }; qcom,cpu-voltage-cdev { compatible = "qcom,cc-cooling-devices"; - apc1_cluster: qcom,apc1-cluster { - qcom,cpus = <&CPU4 &CPU7>; + apc1_cluster: thermal-cluster-4-7 { + qcom,cluster0 = <&CPU4 &CPU5 &CPU6>; + qcom,cluster1 = <&CPU7>; #cooling-cells = <2>; }; }; @@ -208,7 +227,17 @@ qcom,cpufreq-cdev { compatible = "qcom,cpufreq-cdev"; - qcom,cpus = <&CPU0 &CPU4 &CPU7>; + cpu-cluster0 { + qcom,cpus = <&CPU0 &CPU1 &CPU2 &CPU3>; + }; + + cpu-cluster1 { + qcom,cpus = <&CPU4 &CPU5 &CPU6>; + }; + + cpu-cluster2 { + qcom,cpus = <&CPU7>; + }; }; qcom,devfreq-cdev { @@ -1331,12 +1360,24 @@ }; cooling-maps { - gold_cdev { + gold_cdev0 { trip = <&ddr_config0>; cooling-device = <&CPU4 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; }; + gold_cdev1 { + trip = <&ddr_config0>; + cooling-device = <&CPU5 + THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + }; + + gold_cdev2 { + trip = <&ddr_config0>; + cooling-device = <&CPU6 + THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + }; + gold_plus_cdev { trip = <&ddr_config0>; cooling-device = <&CPU7 diff --git a/qcom/neo-thermal.dtsi b/qcom/neo-thermal.dtsi index c9a402fa..72b86980 100644 --- a/qcom/neo-thermal.dtsi +++ b/qcom/neo-thermal.dtsi @@ -21,21 +21,25 @@ cpu0_pause: cpu0-pause { qcom,cpus = <&CPU0>; + qcom,cdev-alias = "thermal-pause-1"; #cooling-cells = <2>; }; cpu1_pause: cpu1-pause { qcom,cpus = <&CPU1>; + qcom,cdev-alias = "thermal-pause-2"; #cooling-cells = <2>; }; cpu2_pause: cpu2-pause { qcom,cpus = <&CPU2>; + qcom,cdev-alias = "thermal-pause-4"; #cooling-cells = <2>; }; cpu3_pause: cpu3-pause { qcom,cpus = <&CPU3>; + qcom,cdev-alias = "thermal-pause-8"; #cooling-cells = <2>; }; @@ -66,21 +70,25 @@ cpu0_hotplug: cpu0-hotplug { qcom,cpu = <&CPU0>; + qcom,cdev-alias = "cpu-hotplug0"; #cooling-cells = <2>; }; cpu1_hotplug: cpu1-hotplug { qcom,cpu = <&CPU1>; + qcom,cdev-alias = "cpu-hotplug1"; #cooling-cells = <2>; }; cpu2_hotplug: cpu2-hotplug { qcom,cpu = <&CPU2>; + qcom,cdev-alias = "cpu-hotplug2"; #cooling-cells = <2>; }; cpu3_hotplug: cpu3-hotplug { qcom,cpu = <&CPU3>; + qcom,cdev-alias = "cpu-hotplug3"; #cooling-cells = <2>; }; }; @@ -116,7 +124,9 @@ qcom,cpufreq-cdev { compatible = "qcom,cpufreq-cdev"; - qcom,cpus = <&CPU0>; + cpu-cluster0 { + qcom,cpus = <&CPU0 &CPU1 &CPU2 &CPU3>; + }; }; qcom,devfreq-cdev { diff --git a/qcom/parrot-thermal.dtsi b/qcom/parrot-thermal.dtsi index 24aaa62b..f861a091 100644 --- a/qcom/parrot-thermal.dtsi +++ b/qcom/parrot-thermal.dtsi @@ -34,46 +34,55 @@ cpu0_pause: cpu0-pause { qcom,cpus = <&CPU0>; + qcom,cdev-alias = "thermal-pause-1"; #cooling-cells = <2>; }; cpu1_pause: cpu1-pause { qcom,cpus = <&CPU1>; + qcom,cdev-alias = "thermal-pause-2"; #cooling-cells = <2>; }; cpu2_pause: cpu2-pause { qcom,cpus = <&CPU2>; + qcom,cdev-alias = "thermal-pause-4"; #cooling-cells = <2>; }; cpu3_pause: cpu3-pause { qcom,cpus = <&CPU3>; + qcom,cdev-alias = "thermal-pause-8"; #cooling-cells = <2>; }; cpu5_pause: cpu5-pause { qcom,cpus = <&CPU5>; + qcom,cdev-alias = "thermal-pause-20"; #cooling-cells = <2>; }; cpu6_pause: cpu6-pause { qcom,cpus = <&CPU6>; + qcom,cdev-alias = "thermal-pause-40"; #cooling-cells = <2>; }; cpu7_pause: cpu7-pause { qcom,cpus = <&CPU7>; + qcom,cdev-alias = "thermal-pause-80"; #cooling-cells = <2>; }; APC1_pause: apc1-pause { qcom,cpus = <&CPU5 &CPU6 &CPU7>; + qcom,cdev-alias = "thermal-pause-E0"; #cooling-cells = <2>; }; cpu_6_7_pause: cpu-6-7-pause { qcom,cpus = <&CPU6 &CPU7>; + qcom,cdev-alias = "thermal-pause-C0"; #cooling-cells = <2>; }; @@ -119,36 +128,43 @@ cpu0_hotplug: cpu0-hotplug { qcom,cpu = <&CPU0>; + qcom,cdev-alias = "cpu-hotplug0"; #cooling-cells = <2>; }; cpu1_hotplug: cpu1-hotplug { qcom,cpu = <&CPU1>; + qcom,cdev-alias = "cpu-hotplug1"; #cooling-cells = <2>; }; cpu2_hotplug: cpu2-hotplug { qcom,cpu = <&CPU2>; + qcom,cdev-alias = "cpu-hotplug2"; #cooling-cells = <2>; }; cpu3_hotplug: cpu3-hotplug { qcom,cpu = <&CPU3>; + qcom,cdev-alias = "cpu-hotplug3"; #cooling-cells = <2>; }; cpu5_hotplug: cpu5-hotplug { qcom,cpu = <&CPU5>; + qcom,cdev-alias = "cpu-hotplug5"; #cooling-cells = <2>; }; cpu6_hotplug: cpu6-hotplug { qcom,cpu = <&CPU6>; + qcom,cdev-alias = "cpu-hotplug6"; #cooling-cells = <2>; }; cpu7_hotplug: cpu7-hotplug { qcom,cpu = <&CPU7>; + qcom,cdev-alias = "cpu-hotplug7"; #cooling-cells = <2>; }; }; @@ -184,7 +200,13 @@ qcom,cpufreq-cdev { compatible = "qcom,cpufreq-cdev"; - qcom,cpus = <&CPU0 &CPU4>; + cpu-cluster0 { + qcom,cpus = <&CPU0 &CPU1 &CPU2 &CPU3>; + }; + + cpu-cluster1 { + qcom,cpus = <&CPU4 &CPU5 &CPU6 &CPU7>; + }; }; qcom,devfreq-cdev { @@ -991,12 +1013,24 @@ }; cooling-maps { - gold_cdev { + gold_cdev0 { trip = <&ddr_config0>; cooling-device = <&CPU4 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; }; + gold_cdev1 { + trip = <&ddr_config0>; + cooling-device = <&CPU5 + THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + }; + + gold_cdev2 { + trip = <&ddr_config0>; + cooling-device = <&CPU6 + THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + }; + gold_plus_cdev { trip = <&ddr_config0>; cooling-device = <&CPU7 diff --git a/qcom/ravelin-thermal.dtsi b/qcom/ravelin-thermal.dtsi index 893c16e4..8f09c873 100644 --- a/qcom/ravelin-thermal.dtsi +++ b/qcom/ravelin-thermal.dtsi @@ -34,46 +34,55 @@ cpu0_pause: cpu0-pause { qcom,cpus = <&CPU0>; + qcom,cdev-alias = "thermal-pause-1"; #cooling-cells = <2>; }; cpu1_pause: cpu1-pause { qcom,cpus = <&CPU1>; + qcom,cdev-alias = "thermal-pause-2"; #cooling-cells = <2>; }; cpu2_pause: cpu2-pause { qcom,cpus = <&CPU2>; + qcom,cdev-alias = "thermal-pause-4"; #cooling-cells = <2>; }; cpu3_pause: cpu3-pause { qcom,cpus = <&CPU3>; + qcom,cdev-alias = "thermal-pause-8"; #cooling-cells = <2>; }; cpu4_pause: cpu4-pause { qcom,cpus = <&CPU4>; + qcom,cdev-alias = "thermal-pause-10"; #cooling-cells = <2>; }; cpu5_pause: cpu5-pause { qcom,cpus = <&CPU5>; + qcom,cdev-alias = "thermal-pause-20"; #cooling-cells = <2>; }; cpu6_pause: cpu6-pause { qcom,cpus = <&CPU6>; + qcom,cdev-alias = "thermal-pause-40"; #cooling-cells = <2>; }; cpu7_pause: cpu7-pause { qcom,cpus = <&CPU7>; + qcom,cdev-alias = "thermal-pause-80"; #cooling-cells = <2>; }; cpu_6_7_pause: cpu-6-7-pause { qcom,cpus = <&CPU6 &CPU7>; + qcom,cdev-alias = "thermal-pause-C0"; #cooling-cells = <2>; }; @@ -124,41 +133,49 @@ cpu0_hotplug: cpu0-hotplug { qcom,cpu = <&CPU0>; + qcom,cdev-alias = "cpu-hotplug0"; #cooling-cells = <2>; }; cpu1_hotplug: cpu1-hotplug { qcom,cpu = <&CPU1>; + qcom,cdev-alias = "cpu-hotplug1"; #cooling-cells = <2>; }; cpu2_hotplug: cpu2-hotplug { qcom,cpu = <&CPU2>; + qcom,cdev-alias = "cpu-hotplug2"; #cooling-cells = <2>; }; cpu3_hotplug: cpu3-hotplug { qcom,cpu = <&CPU3>; + qcom,cdev-alias = "cpu-hotplug3"; #cooling-cells = <2>; }; cpu4_hotplug: cpu4-hotplug { qcom,cpu = <&CPU4>; + qcom,cdev-alias = "cpu-hotplug4"; #cooling-cells = <2>; }; cpu5_hotplug: cpu5-hotplug { qcom,cpu = <&CPU5>; + qcom,cdev-alias = "cpu-hotplug5"; #cooling-cells = <2>; }; cpu6_hotplug: cpu6-hotplug { qcom,cpu = <&CPU6>; + qcom,cdev-alias = "cpu-hotplug6"; #cooling-cells = <2>; }; cpu7_hotplug: cpu7-hotplug { qcom,cpu = <&CPU7>; + qcom,cdev-alias = "cpu-hotplug7"; #cooling-cells = <2>; }; }; @@ -177,7 +194,13 @@ qcom,cpufreq-cdev { compatible = "qcom,cpufreq-cdev"; - qcom,cpus = <&CPU0 &CPU6>; + cpu-cluster0 { + qcom,cpus = <&CPU0 &CPU1 &CPU2 &CPU3 &CPU4 &CPU5>; + }; + + cpu-cluster1 { + qcom,cpus = <&CPU6 &CPU7>; + }; }; qcom,devfreq-cdev { diff --git a/qcom/waipio-thermal-overlay.dtsi b/qcom/waipio-thermal-overlay.dtsi index f82f525c..20cb279d 100644 --- a/qcom/waipio-thermal-overlay.dtsi +++ b/qcom/waipio-thermal-overlay.dtsi @@ -172,6 +172,16 @@ cooling-device = <&CPU4 15 THERMAL_NO_LIMIT>; }; + pm8450_cpu5_freq { + trip = <&pm8450_trip0>; + cooling-device = <&CPU5 15 THERMAL_NO_LIMIT>; + }; + + pm8450_cpu6_freq { + trip = <&pm8450_trip0>; + cooling-device = <&CPU6 15 THERMAL_NO_LIMIT>; + }; + pm8450_cpu7_freq { trip = <&pm8450_trip0>; cooling-device = <&CPU7 15 THERMAL_NO_LIMIT>; @@ -196,6 +206,16 @@ cooling-device = <&CPU4 15 THERMAL_NO_LIMIT>; }; + pm8350_cpu5_freq { + trip = <&pm8350_trip0>; + cooling-device = <&CPU5 15 THERMAL_NO_LIMIT>; + }; + + pm8350_cpu6_freq { + trip = <&pm8350_trip0>; + cooling-device = <&CPU6 15 THERMAL_NO_LIMIT>; + }; + pm8350_cpu7_freq { trip = <&pm8350_trip0>; cooling-device = <&CPU7 15 THERMAL_NO_LIMIT>; @@ -234,6 +254,16 @@ cooling-device = <&CPU4 15 THERMAL_NO_LIMIT>; }; + cpu5_freq_cdev { + trip = <&xo_config0>; + cooling-device = <&CPU5 15 THERMAL_NO_LIMIT>; + }; + + cpu6_freq_cdev { + trip = <&xo_config0>; + cooling-device = <&CPU6 15 THERMAL_NO_LIMIT>; + }; + cpu7_freq_cdev { trip = <&xo_config0>; cooling-device = <&CPU7 15 THERMAL_NO_LIMIT>; diff --git a/qcom/waipio-thermal.dtsi b/qcom/waipio-thermal.dtsi index a8ac6f72..a773589c 100644 --- a/qcom/waipio-thermal.dtsi +++ b/qcom/waipio-thermal.dtsi @@ -32,46 +32,55 @@ cpu0_pause: cpu0-pause { qcom,cpus = <&CPU0>; + qcom,cdev-alias = "thermal-pause-1"; #cooling-cells = <2>; }; cpu1_pause: cpu1-pause { qcom,cpus = <&CPU1>; + qcom,cdev-alias = "thermal-pause-2"; #cooling-cells = <2>; }; cpu2_pause: cpu2-pause { qcom,cpus = <&CPU2>; + qcom,cdev-alias = "thermal-pause-4"; #cooling-cells = <2>; }; cpu3_pause: cpu3-pause { qcom,cpus = <&CPU3>; + qcom,cdev-alias = "thermal-pause-8"; #cooling-cells = <2>; }; cpu5_pause: cpu5-pause { qcom,cpus = <&CPU5>; + qcom,cdev-alias = "thermal-pause-20"; #cooling-cells = <2>; }; cpu6_pause: cpu6-pause { qcom,cpus = <&CPU6>; + qcom,cdev-alias = "thermal-pause-40"; #cooling-cells = <2>; }; cpu7_pause: cpu7-pause { qcom,cpus = <&CPU7>; + qcom,cdev-alias = "thermal-pause-80"; #cooling-cells = <2>; }; APC1_pause: apc1-pause { qcom,cpus = <&CPU5 &CPU6 &CPU7>; + qcom,cdev-alias = "thermal-pause-E0"; #cooling-cells = <2>; }; cpu_6_7_pause: cpu-6-7-pause { qcom,cpus = <&CPU6 &CPU7>; + qcom,cdev-alias = "thermal-pause-C0"; #cooling-cells = <2>; }; @@ -117,44 +126,52 @@ cpu0_hotplug: cpu0-hotplug { qcom,cpu = <&CPU0>; + qcom,cdev-alias = "cpu-hotplug0"; #cooling-cells = <2>; }; cpu1_hotplug: cpu1-hotplug { qcom,cpu = <&CPU1>; + qcom,cdev-alias = "cpu-hotplug1"; #cooling-cells = <2>; }; cpu2_hotplug: cpu2-hotplug { qcom,cpu = <&CPU2>; + qcom,cdev-alias = "cpu-hotplug2"; #cooling-cells = <2>; }; cpu3_hotplug: cpu3-hotplug { qcom,cpu = <&CPU3>; + qcom,cdev-alias = "cpu-hotplug3"; #cooling-cells = <2>; }; cpu5_hotplug: cpu5-hotplug { qcom,cpu = <&CPU5>; + qcom,cdev-alias = "cpu-hotplug5"; #cooling-cells = <2>; }; cpu6_hotplug: cpu6-hotplug { qcom,cpu = <&CPU6>; + qcom,cdev-alias = "cpu-hotplug6"; #cooling-cells = <2>; }; cpu7_hotplug: cpu7-hotplug { qcom,cpu = <&CPU7>; + qcom,cdev-alias = "cpu-hotplug7"; #cooling-cells = <2>; }; }; qcom,cpu-voltage-cdev { compatible = "qcom,cc-cooling-devices"; - apc1_cluster: qcom,apc1-cluster { - qcom,cpus = <&CPU4 &CPU7>; + apc1_cluster: thermal-cluster-4-7 { + qcom,cluster0 = <&CPU4 &CPU5 &CPU6>; + qcom,cluster1 = <&CPU7>; #cooling-cells = <2>; }; }; @@ -202,7 +219,17 @@ qcom,cpufreq-cdev { compatible = "qcom,cpufreq-cdev"; - qcom,cpus = <&CPU0 &CPU4 &CPU7>; + cpu-cluster0 { + qcom,cpus = <&CPU0 &CPU1 &CPU2 &CPU3>; + }; + + cpu-cluster1 { + qcom,cpus = <&CPU4 &CPU5 &CPU6>; + }; + + cpu-cluster2 { + qcom,cpus = <&CPU7>; + }; }; qcom,devfreq-cdev { @@ -1098,12 +1125,24 @@ }; cooling-maps { - gold_cdev { + gold_cdev0 { trip = <&ddr_config0>; cooling-device = <&CPU4 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; }; + gold_cdev1 { + trip = <&ddr_config0>; + cooling-device = <&CPU5 + THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + }; + + gold_cdev2 { + trip = <&ddr_config0>; + cooling-device = <&CPU6 + THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + }; + gold_plus_cdev { trip = <&ddr_config0>; cooling-device = <&CPU7