]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
ARM: dts: apq8064: Remove duplicate thermal-zones
authorGeorgi Djakov <georgi.djakov@linaro.org>
Thu, 5 May 2016 11:15:36 +0000 (14:15 +0300)
committerNicolas Dechesne <nicolas.dechesne@linaro.org>
Thu, 2 Jun 2016 15:10:56 +0000 (17:10 +0200)
Remove the duplicate thermal-zones.

Signed-off-by: Georgi Djakov <georgi.djakov@linaro.org>
arch/arm/boot/dts/qcom-apq8064.dtsi

index 5b46c1054b756ab2bd221e62e81f4cf216e46c71..dc58c23328053332455a5a662d8212d4cf402a35 100644 (file)
                        polling-delay-passive = <250>;
                        polling-delay = <1000>;
 
-                       thermal-sensors = <&tsens 7>;
+                       thermal-sensors = <&gcc 7>;
 
                        trips {
                                cpu_alert0: trip@0 {
                        polling-delay-passive = <250>;
                        polling-delay = <1000>;
 
-                       thermal-sensors = <&tsens 8>;
+                       thermal-sensors = <&gcc 8>;
 
                        trips {
                                cpu_alert1: trip@0 {
                        polling-delay-passive = <250>;
                        polling-delay = <1000>;
 
-                       thermal-sensors = <&tsens 9>;
+                       thermal-sensors = <&gcc 9>;
 
                        trips {
                                cpu_alert2: trip@0 {
                        polling-delay-passive = <250>;
                        polling-delay = <1000>;
 
-                       thermal-sensors = <&tsens 10>;
+                       thermal-sensors = <&gcc 10>;
 
                        trips {
                                cpu_alert3: trip@0 {
                };
        };
 
-       thermal-zones {
-               cpu-thermal0 {
-                       polling-delay-passive = <250>;
-                       polling-delay = <1000>;
-
-                       thermal-sensors = <&gcc 7>;
-
-                       trips {
-                               cpu_alert0: trip@0 {
-                                       temperature = <75000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-                               cpu_crit0: trip@1 {
-                                       temperature = <95000>;
-                                       hysteresis = <2000>;
-                                       type = "critical";
-                               };
-                       };
-               };
-
-               cpu-thermal1 {
-                       polling-delay-passive = <250>;
-                       polling-delay = <1000>;
-
-                       thermal-sensors = <&gcc 8>;
-
-                       trips {
-                               cpu_alert1: trip@0 {
-                                       temperature = <75000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-                               cpu_crit1: trip@1 {
-                                       temperature = <95000>;
-                                       hysteresis = <2000>;
-                                       type = "critical";
-                               };
-                       };
-               };
-
-               cpu-thermal2 {
-                       polling-delay-passive = <250>;
-                       polling-delay = <1000>;
-
-                       thermal-sensors = <&gcc 9>;
-
-                       trips {
-                               cpu_alert2: trip@0 {
-                                       temperature = <75000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-                               cpu_crit2: trip@1 {
-                                       temperature = <95000>;
-                                       hysteresis = <2000>;
-                                       type = "critical";
-                               };
-                       };
-               };
-
-               cpu-thermal3 {
-                       polling-delay-passive = <250>;
-                       polling-delay = <1000>;
-
-                       thermal-sensors = <&gcc 10>;
-
-                       trips {
-                               cpu_alert3: trip@0 {
-                                       temperature = <75000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-                               cpu_crit3: trip@1 {
-                                       temperature = <95000>;
-                                       hysteresis = <2000>;
-                                       type = "critical";
-                               };
-                       };
-               };
-       };
-
        cpu-pmu {
                compatible = "qcom,krait-pmu";
                interrupts = <1 10 0x304>;