Skip to contentSkip to conversation

arm64: dts: imx8mq: Move thermal-zones out of bus node

PATCH In review Fabio Estevam 2 participants 2 messages Mar 25, 2019 – Mar 29, 2019

Subsystems (2)
lore
Share & tools
lore

Fabio Estevam

author reviewer
#0 lore raw

PATCH 1/1 arm64: dts: imx8mq: Move thermal-zones out of bus node

thermal-zones node does not have any register properties and thus shouldn't be placed inside the bus.

Move thermal-zones node from soc node to root node in order to fix the following build warning with W=1:

arch/arm64/boot/dts/freescale/imx8mq.dtsi:305.18-364.6: Warning (simple_bus_reg): /soc@0/bus@30000000/thermal-zones: missing or empty reg/ranges property

Fixes e464fd2ba4d4 ("arm64: dts: imx8mq: enable the multi sensor TMU")
---
 arch/arm64/boot/dts/freescale/imx8mq.dtsi | 122 +++++++++++-----------
 1 file changed, 61 insertions(+), 61 deletions(-)
arch/arm64/boot/dts/freescale/imx8mq.dtsi +61 -61
index 230f198ad87a..feb195984997 100644
@@ -167,6 +167,67 @@
 		method = "smc";
 	};
 
+	thermal-zones {
+		cpu-thermal {
+			polling-delay-passive = <250>;
+			polling-delay = <2000>;
+			thermal-sensors = <&tmu 0>;
+
+			trips {
+				cpu_alert: cpu-alert {
+					temperature = <80000>;
+					hysteresis = <2000>;
+					type = "passive";
+				};
+
+				cpu-crit {
+					temperature = <90000>;
+					hysteresis = <2000>;
+					type = "critical";
+				};
+			};
+
+			cooling-maps {
+				map0 {
+					trip = <&cpu_alert>;
+					cooling-device =
+						<&A53_0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+						<&A53_1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+						<&A53_2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+						<&A53_3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+				};
+			};
+		};
+
+		gpu-thermal {
+			polling-delay-passive = <250>;
+			polling-delay = <2000>;
+			thermal-sensors = <&tmu 1>;
+
+			trips {
+				gpu-crit {
+					temperature = <90000>;
+					hysteresis = <2000>;
+					type = "critical";
+				};
+			};
+		};
+
+		vpu-thermal {
+			polling-delay-passive = <250>;
+			polling-delay = <2000>;
+			thermal-sensors = <&tmu 2>;
+
+			trips {
+				vpu-crit {
+					temperature = <90000>;
+					hysteresis = <2000>;
+					type = "critical";
+				};
+			};
+		};
+	};
+
 	timer {
 		compatible = "arm,armv8-timer";
 		interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_LOW>, /* Physical Secure */
@@ -302,67 +363,6 @@
 				#thermal-sensor-cells =  <1>;
 			};
 
-			thermal-zones {
-				cpu-thermal {
-					polling-delay-passive = <250>;
-					polling-delay = <2000>;
-					thermal-sensors = <&tmu 0>;
-
-					trips {
-						cpu_alert: cpu-alert {
-							temperature = <80000>;
-							hysteresis = <2000>;
-							type = "passive";
-						};
-
-						cpu-crit {
-							temperature = <90000>;
-							hysteresis = <2000>;
-							type = "critical";
-						};
-					};
-
-					cooling-maps {
-						map0 {
-							trip = <&cpu_alert>;
-							cooling-device =
-								<&A53_0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-								<&A53_1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-								<&A53_2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-								<&A53_3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
-						};
-					};
-				};
-
-				gpu-thermal {
-					polling-delay-passive = <250>;
-					polling-delay = <2000>;
-					thermal-sensors = <&tmu 1>;
-
-					trips {
-						gpu-crit {
-							temperature = <90000>;
-							hysteresis = <2000>;
-							type = "critical";
-						};
-					};
-				};
-
-				vpu-thermal {
-					polling-delay-passive = <250>;
-					polling-delay = <2000>;
-					thermal-sensors = <&tmu 2>;
-
-					trips {
-						vpu-crit {
-							temperature = <90000>;
-							hysteresis = <2000>;
-							type = "critical";
-						};
-					};
-				};
-			};
-
 			wdog1: watchdog@30280000 {
 				compatible = "fsl,imx8mq-wdt", "fsl,imx21-wdt";
 				reg = <0x30280000 0x10000>;
Signature · 7 lines
2.17.1


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
#1 lore raw
Quoted 9 lines · Fabio Estevam

thermal-zones node does not have any register properties and thus shouldn't be placed inside the bus.

Move thermal-zones node from soc node to root node in order to fix the following build warning with W=1:

arch/arm64/boot/dts/freescale/imx8mq.dtsi:305.18-364.6: Warning (simple_bus_reg): /soc@0/bus@30000000/thermal-zones: missing or empty reg/ranges property

Fixes e464fd2ba4d4 ("arm64: dts: imx8mq: enable the multi sensor TMU")

My branches could be rebased, so the commit id is not really stable. I dropped the tag and applied the patch.

Shawn

Quoted 148 lines
---
 arch/arm64/boot/dts/freescale/imx8mq.dtsi | 122 +++++++++++-----------
 1 file changed, 61 insertions(+), 61 deletions(-)
arch/arm64/boot/dts/freescale/imx8mq.dtsi +61 -61
index 230f198ad87a..feb195984997 100644
@@ -167,6 +167,67 @@
 		method = "smc";
 	};
 
+	thermal-zones {
+		cpu-thermal {
+			polling-delay-passive = <250>;
+			polling-delay = <2000>;
+			thermal-sensors = <&tmu 0>;
+
+			trips {
+				cpu_alert: cpu-alert {
+					temperature = <80000>;
+					hysteresis = <2000>;
+					type = "passive";
+				};
+
+				cpu-crit {
+					temperature = <90000>;
+					hysteresis = <2000>;
+					type = "critical";
+				};
+			};
+
+			cooling-maps {
+				map0 {
+					trip = <&cpu_alert>;
+					cooling-device =
+						<&A53_0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+						<&A53_1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+						<&A53_2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+						<&A53_3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+				};
+			};
+		};
+
+		gpu-thermal {
+			polling-delay-passive = <250>;
+			polling-delay = <2000>;
+			thermal-sensors = <&tmu 1>;
+
+			trips {
+				gpu-crit {
+					temperature = <90000>;
+					hysteresis = <2000>;
+					type = "critical";
+				};
+			};
+		};
+
+		vpu-thermal {
+			polling-delay-passive = <250>;
+			polling-delay = <2000>;
+			thermal-sensors = <&tmu 2>;
+
+			trips {
+				vpu-crit {
+					temperature = <90000>;
+					hysteresis = <2000>;
+					type = "critical";
+				};
+			};
+		};
+	};
+
 	timer {
 		compatible = "arm,armv8-timer";
 		interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_LOW>, /* Physical Secure */
@@ -302,67 +363,6 @@
 				#thermal-sensor-cells =  <1>;
 			};
 
-			thermal-zones {
-				cpu-thermal {
-					polling-delay-passive = <250>;
-					polling-delay = <2000>;
-					thermal-sensors = <&tmu 0>;
-
-					trips {
-						cpu_alert: cpu-alert {
-							temperature = <80000>;
-							hysteresis = <2000>;
-							type = "passive";
-						};
-
-						cpu-crit {
-							temperature = <90000>;
-							hysteresis = <2000>;
-							type = "critical";
-						};
-					};
-
-					cooling-maps {
-						map0 {
-							trip = <&cpu_alert>;
-							cooling-device =
-								<&A53_0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-								<&A53_1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-								<&A53_2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-								<&A53_3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
-						};
-					};
-				};
-
-				gpu-thermal {
-					polling-delay-passive = <250>;
-					polling-delay = <2000>;
-					thermal-sensors = <&tmu 1>;
-
-					trips {
-						gpu-crit {
-							temperature = <90000>;
-							hysteresis = <2000>;
-							type = "critical";
-						};
-					};
-				};
-
-				vpu-thermal {
-					polling-delay-passive = <250>;
-					polling-delay = <2000>;
-					thermal-sensors = <&tmu 2>;
-
-					trips {
-						vpu-crit {
-							temperature = <90000>;
-							hysteresis = <2000>;
-							type = "critical";
-						};
-					};
-				};
-			};
-
 			wdog1: watchdog@30280000 {
 				compatible = "fsl,imx8mq-wdt", "fsl,imx21-wdt";
 				reg = <0x30280000 0x10000>;
Signature · 1 line
2.17.1

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel