[PATCH 09/19] ARM: dts: sunxi: Remove thermal zones without trip points

Maxime Ripard maxime at cerno.tech
Thu Jan 14 06:35:28 EST 2021


The thermal zone binding requires a trips node with a list of trip
points, however some thermal zones (usually the GPU ones) in our DTSI
don't provide it.

Remove them until we have something to fill there.

Signed-off-by: Maxime Ripard <maxime at cerno.tech>
---
 arch/arm/boot/dts/sun8i-a83t.dtsi             |  6 ------
 arch/arm/boot/dts/sun8i-r40.dtsi              | 16 ---------------
 .../arm64/boot/dts/allwinner/sun50i-a100.dtsi | 20 -------------------
 arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 14 -------------
 arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi  |  6 ------
 arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi  |  6 ------
 6 files changed, 68 deletions(-)

diff --git a/arch/arm/boot/dts/sun8i-a83t.dtsi b/arch/arm/boot/dts/sun8i-a83t.dtsi
index c010b27fdb6a..d42b6a0d1b53 100644
--- a/arch/arm/boot/dts/sun8i-a83t.dtsi
+++ b/arch/arm/boot/dts/sun8i-a83t.dtsi
@@ -1264,11 +1264,5 @@ cpu-hot-limit {
 				};
 			};
 		};
-
-		gpu_thermal: gpu-thermal {
-			polling-delay-passive = <0>;
-			polling-delay = <0>;
-			thermal-sensors = <&ths 2>;
-		};
 	};
 };
diff --git a/arch/arm/boot/dts/sun8i-r40.dtsi b/arch/arm/boot/dts/sun8i-r40.dtsi
index d5ad3b9efd12..921cf8088413 100644
--- a/arch/arm/boot/dts/sun8i-r40.dtsi
+++ b/arch/arm/boot/dts/sun8i-r40.dtsi
@@ -111,22 +111,6 @@ de: display-engine {
 		status = "disabled";
 	};
 
-	thermal-zones {
-		cpu_thermal: cpu0-thermal {
-			/* milliseconds */
-			polling-delay-passive = <0>;
-			polling-delay = <0>;
-			thermal-sensors = <&ths 0>;
-		};
-
-		gpu_thermal: gpu-thermal {
-			/* milliseconds */
-			polling-delay-passive = <0>;
-			polling-delay = <0>;
-			thermal-sensors = <&ths 1>;
-		};
-	};
-
 	soc {
 		compatible = "simple-bus";
 		#address-cells = <1>;
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a100.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a100.dtsi
index cc321c04f121..93fe7eee10cb 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a100.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a100.dtsi
@@ -341,24 +341,4 @@ r_i2c1: i2c at 7081800 {
 			#size-cells = <0>;
 		};
 	};
-
-	thermal-zones {
-		cpu-thermal-zone {
-			polling-delay-passive = <0>;
-			polling-delay = <0>;
-			thermal-sensors = <&ths 0>;
-		};
-
-		ddr-thermal-zone {
-			polling-delay-passive = <0>;
-			polling-delay = <0>;
-			thermal-sensors = <&ths 2>;
-		};
-
-		gpu-thermal-zone {
-			polling-delay-passive = <0>;
-			polling-delay = <0>;
-			thermal-sensors = <&ths 1>;
-		};
-	};
 };
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
index 51cc30e84e26..9d3b280bd151 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
@@ -215,20 +215,6 @@ cpu_crit: cpu_crit {
 				};
 			};
 		};
-
-		gpu0_thermal: gpu0-thermal {
-			/* milliseconds */
-			polling-delay-passive = <0>;
-			polling-delay = <0>;
-			thermal-sensors = <&ths 1>;
-		};
-
-		gpu1_thermal: gpu1-thermal {
-			/* milliseconds */
-			polling-delay-passive = <0>;
-			polling-delay = <0>;
-			thermal-sensors = <&ths 2>;
-		};
 	};
 
 	soc {
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi
index 578a63dedf46..f364918f8647 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi
@@ -216,12 +216,6 @@ cpu-hot-limit {
 				};
 			};
 		};
-
-		gpu_thermal {
-			polling-delay-passive = <0>;
-			polling-delay = <0>;
-			thermal-sensors = <&ths 1>;
-		};
 	};
 };
 
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
index 8a62a9fbe347..f35bd3b5b2a6 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
@@ -1022,11 +1022,5 @@ map0 {
 				};
 			};
 		};
-
-		gpu-thermal {
-			polling-delay-passive = <0>;
-			polling-delay = <0>;
-			thermal-sensors = <&ths 1>;
-		};
 	};
 };
-- 
2.29.2




More information about the linux-arm-kernel mailing list