]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
arm64: dts: ls1046a: Move cpu_thermal out of bus node
authorFabio Estevam <fabio.estevam@nxp.com>
Mon, 5 Feb 2018 18:45:34 +0000 (16:45 -0200)
committerShawn Guo <shawnguo@kernel.org>
Mon, 12 Feb 2018 05:11:03 +0000 (13:11 +0800)
Move cpu_thermal node from soc node to root node.

cpu_thermal node does not have any register properties and thus
shouldn't be placed on the bus.

This fixes the following build warnings with W=1:

arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dtb: Warning (simple_bus_reg): Node /soc/thermal-zones missing or empty reg/ranges property

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi

index 06b5e12d04d818546f6597b6f1b01bf52aa83836..3f8b62010c7c6e77c3d996c19392cd3192938f01 100644 (file)
@@ -147,6 +147,37 @@ reboot {
                mask = <0x02>;
        };
 
+       thermal-zones {
+               cpu_thermal: cpu-thermal {
+                       polling-delay-passive = <1000>;
+                       polling-delay = <5000>;
+                       thermal-sensors = <&tmu 3>;
+
+                       trips {
+                               cpu_alert: cpu-alert {
+                                       temperature = <85000>;
+                                       hysteresis = <2000>;
+                                       type = "passive";
+                               };
+
+                               cpu_crit: cpu-crit {
+                                       temperature = <95000>;
+                                       hysteresis = <2000>;
+                                       type = "critical";
+                               };
+                       };
+
+                       cooling-maps {
+                               map0 {
+                                       trip = <&cpu_alert>;
+                                       cooling-device =
+                                               <&cpu0 THERMAL_NO_LIMIT
+                                               THERMAL_NO_LIMIT>;
+                               };
+                       };
+               };
+       };
+
        timer {
                compatible = "arm,armv8-timer";
                interrupts = <GIC_PPI 13 (GIC_CPU_MASK_RAW(0xf) |
@@ -362,37 +393,6 @@ tmu: tmu@1f00000 {
                        #thermal-sensor-cells = <1>;
                };
 
-               thermal-zones {
-                       cpu_thermal: cpu-thermal {
-                               polling-delay-passive = <1000>;
-                               polling-delay = <5000>;
-                               thermal-sensors = <&tmu 3>;
-
-                               trips {
-                                       cpu_alert: cpu-alert {
-                                               temperature = <85000>;
-                                               hysteresis = <2000>;
-                                               type = "passive";
-                                       };
-
-                                       cpu_crit: cpu-crit {
-                                               temperature = <95000>;
-                                               hysteresis = <2000>;
-                                               type = "critical";
-                                       };
-                               };
-
-                               cooling-maps {
-                                       map0 {
-                                               trip = <&cpu_alert>;
-                                               cooling-device =
-                                                       <&cpu0 THERMAL_NO_LIMIT
-                                                       THERMAL_NO_LIMIT>;
-                                       };
-                               };
-                       };
-               };
-
                dspi: dspi@2100000 {
                        compatible = "fsl,ls1021a-v1.0-dspi";
                        #address-cells = <1>;