Skip to contentSkip to conversation

arm: dts: rockchip: rk3288: move thermal sub nodes to dtsi

PATCH Superseded Johan Jonker 2 participants 3 messages Jul 29, 2022 – Sep 28, 2022 Arm (32-bit)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 arm: dts: rockchip: rk3288: move thermal sub nodes to dtsi

In order to better compare the Linux rk3288.dtsi version with the u-boot version move thermal sub nodes to the dtsi file and remove rk3288-thermal.dtsi

Changed:
replace underscore in nodename
remove comments about sensor and ID
use gpu phandle
add #cooling-cells to gpu node
lower critical temparature
remove linux,hwmon property

---
 arch/arm/dts/rk3288-thermal.dtsi | 87 --------------------------------
 arch/arm/dts/rk3288.dtsi         | 74 ++++++++++++++++++++++++++-
 2 files changed, 73 insertions(+), 88 deletions(-)
 delete mode 100644 arch/arm/dts/rk3288-thermal.dtsi
arch/arm/dts/rk3288-thermal.dtsi deleted +0 -87
deleted file mode 100644
index 87dd8142..00000000
@@ -1,87 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Device Tree Source for RK3288 SoC thermal
- *
- * Copyright (c) 2014, Fuzhou Rockchip Electronics Co., Ltd
- */
-
-#include <dt-bindings/thermal/thermal.h>
-
-reserve_thermal: reserve_thermal {
-	polling-delay-passive = <1000>; /* milliseconds */
-	polling-delay = <5000>; /* milliseconds */
-
-			/* sensor	ID */
-	thermal-sensors = <&tsadc	0>;
-
-};
-
-cpu_thermal: cpu_thermal {
-	polling-delay-passive = <100>; /* milliseconds */
-	polling-delay = <5000>; /* milliseconds */
-
-			/* sensor	ID */
-	thermal-sensors = <&tsadc	1>;
-	linux,hwmon;
-
-	trips {
-		cpu_alert0: cpu_alert0 {
-			temperature = <70000>; /* millicelsius */
-			hysteresis = <2000>; /* millicelsius */
-			type = "passive";
-		};
-		cpu_alert1: cpu_alert1 {
-			temperature = <75000>; /* millicelsius */
-			hysteresis = <2000>; /* millicelsius */
-			type = "passive";
-		};
-		cpu_crit: cpu_crit {
-			temperature = <100000>; /* millicelsius */
-			hysteresis = <2000>; /* millicelsius */
-			type = "critical";
-		};
-	};
-
-	cooling-maps {
-		map0 {
-			trip = <&cpu_alert0>;
-			cooling-device =
-				<&cpu0 THERMAL_NO_LIMIT 6>;
-		};
-		map1 {
-			trip = <&cpu_alert1>;
-			cooling-device =
-				<&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
-		};
-	};
-};
-
-gpu_thermal: gpu_thermal {
-	polling-delay-passive = <100>; /* milliseconds */
-	polling-delay = <5000>; /* milliseconds */
-
-			/* sensor	ID */
-	thermal-sensors = <&tsadc	2>;
-	linux,hwmon;
-
-	trips {
-		gpu_alert0: gpu_alert0 {
-			temperature = <80000>; /* millicelsius */
-			hysteresis = <2000>; /* millicelsius */
-			type = "passive";
-		};
-		gpu_crit: gpu_crit {
-			temperature = <100000>; /* millicelsius */
-			hysteresis = <2000>; /* millicelsius */
-			type = "critical";
-		};
-	};
-
-	cooling-maps {
-		map0 {
-			trip = <&gpu_alert0>;
-			cooling-device =
-				<&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
-		};
-	};
-};
arch/arm/dts/rk3288.dtsi +73 -1

86 lines not on this page · raw message

Signature · 1 line
2.20.1
Reviewed-by on v1 1/3
#1 lore raw
Quoted 12 lines · Johan Jonker

In order to better compare the Linux rk3288.dtsi version with the u-boot version move thermal sub nodes to the dtsi file and remove rk3288-thermal.dtsi

Changed:
replace underscore in nodename
remove comments about sensor and ID
use gpu phandle
add #cooling-cells to gpu node
lower critical temparature
remove linux,hwmon property

Quoted 1 line

Thanks,
- Kever

Quoted 191 lines
---
  arch/arm/dts/rk3288-thermal.dtsi | 87 --------------------------------
  arch/arm/dts/rk3288.dtsi         | 74 ++++++++++++++++++++++++++-
  2 files changed, 73 insertions(+), 88 deletions(-)

delete mode 100644 arch/arm/dts/rk3288-thermal.dtsi

arch/arm/dts/rk3288-thermal.dtsi deleted +0 -87
deleted file mode 100644
index 87dd8142..00000000
@@ -1,87 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Device Tree Source for RK3288 SoC thermal
- *
- * Copyright (c) 2014, Fuzhou Rockchip Electronics Co., Ltd
- */
-
-#include <dt-bindings/thermal/thermal.h>
-
-reserve_thermal: reserve_thermal {
-	polling-delay-passive = <1000>; /* milliseconds */
-	polling-delay = <5000>; /* milliseconds */
-
-			/* sensor	ID */
-	thermal-sensors = <&tsadc	0>;
-
-};
-
-cpu_thermal: cpu_thermal {
-	polling-delay-passive = <100>; /* milliseconds */
-	polling-delay = <5000>; /* milliseconds */
-
-			/* sensor	ID */
-	thermal-sensors = <&tsadc	1>;
-	linux,hwmon;
-
-	trips {
-		cpu_alert0: cpu_alert0 {
-			temperature = <70000>; /* millicelsius */
-			hysteresis = <2000>; /* millicelsius */
-			type = "passive";
-		};
-		cpu_alert1: cpu_alert1 {
-			temperature = <75000>; /* millicelsius */
-			hysteresis = <2000>; /* millicelsius */
-			type = "passive";
-		};
-		cpu_crit: cpu_crit {
-			temperature = <100000>; /* millicelsius */
-			hysteresis = <2000>; /* millicelsius */
-			type = "critical";
-		};
-	};
-
-	cooling-maps {
-		map0 {
-			trip = <&cpu_alert0>;
-			cooling-device =
-				<&cpu0 THERMAL_NO_LIMIT 6>;
-		};
-		map1 {
-			trip = <&cpu_alert1>;
-			cooling-device =
-				<&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
-		};
-	};
-};
-
-gpu_thermal: gpu_thermal {
-	polling-delay-passive = <100>; /* milliseconds */
-	polling-delay = <5000>; /* milliseconds */
-
-			/* sensor	ID */
-	thermal-sensors = <&tsadc	2>;
-	linux,hwmon;
-
-	trips {
-		gpu_alert0: gpu_alert0 {
-			temperature = <80000>; /* millicelsius */
-			hysteresis = <2000>; /* millicelsius */
-			type = "passive";
-		};
-		gpu_crit: gpu_crit {
-			temperature = <100000>; /* millicelsius */
-			hysteresis = <2000>; /* millicelsius */
-			type = "critical";
-		};
-	};
-
-	cooling-maps {
-		map0 {
-			trip = <&gpu_alert0>;
-			cooling-device =
-				<&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
-		};
-	};
-};
arch/arm/dts/rk3288.dtsi +73 -1
index 9fb6d86b..c46741b0 100644
@@ -339,7 +339,78 @@
  	};
 
  	thermal: thermal-zones {
-		#include "rk3288-thermal.dtsi"
+		reserve_thermal: reserve-thermal {
+			polling-delay-passive = <1000>; /* milliseconds */
+			polling-delay = <5000>; /* milliseconds */
+
+			thermal-sensors = <&tsadc 0>;
+		};
+
+		cpu_thermal: cpu-thermal {
+			polling-delay-passive = <100>; /* milliseconds */
+			polling-delay = <5000>; /* milliseconds */
+
+			thermal-sensors = <&tsadc 1>;
+
+			trips {
+				cpu_alert0: cpu_alert0 {
+					temperature = <70000>; /* millicelsius */
+					hysteresis = <2000>; /* millicelsius */
+					type = "passive";
+				};
+				cpu_alert1: cpu_alert1 {
+					temperature = <75000>; /* millicelsius */
+					hysteresis = <2000>; /* millicelsius */
+					type = "passive";
+				};
+				cpu_crit: cpu_crit {
+					temperature = <90000>; /* millicelsius */
+					hysteresis = <2000>; /* millicelsius */
+					type = "critical";
+				};
+			};
+
+			cooling-maps {
+				map0 {
+					trip = <&cpu_alert0>;
+					cooling-device =
+						<&cpu0 THERMAL_NO_LIMIT 6>;
+				};
+				map1 {
+					trip = <&cpu_alert1>;
+					cooling-device =
+						<&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+				};
+			};
+		};
+
+		gpu_thermal: gpu-thermal {
+			polling-delay-passive = <100>; /* milliseconds */
+			polling-delay = <5000>; /* milliseconds */
+
+			thermal-sensors = <&tsadc 2>;
+
+			trips {
+				gpu_alert0: gpu_alert0 {
+					temperature = <70000>; /* millicelsius */
+					hysteresis = <2000>; /* millicelsius */
+					type = "passive";
+				};
+				gpu_crit: gpu_crit {
+					temperature = <90000>; /* millicelsius */
+					hysteresis = <2000>; /* millicelsius */
+					type = "critical";
+				};
+			};
+
+			cooling-maps {
+				map0 {
+					trip = <&gpu_alert0>;
+					cooling-device =
+						<&gpu THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+				};
+			};
+		};
  	};
 
  	tsadc: tsadc@ff280000 {
@@ -849,6 +920,7 @@
  			/* 500000 1200000 - See crosbug.com/p/33857 */
  			600000 1250000
  		>;
+		#cooling-cells = <2>; /* min followed by max */
  		power-domains = <&power RK3288_PD_GPU>;
  		status = "disabled";
  	};
#2 lore raw

Hi Johan,

    patch 3/3 of this series is not able to apply, could you please resend this patch set with rebase?

Thanks,

- Kever

Quoted 209 lines · Kever Yang
Quoted 12 lines · Johan Jonker

In order to better compare the Linux rk3288.dtsi version with the u-boot version move thermal sub nodes to the dtsi file and remove rk3288-thermal.dtsi

Changed:
   replace underscore in nodename
   remove comments about sensor and ID
   use gpu phandle
   add #cooling-cells to gpu node
   lower critical temparature
   remove linux,hwmon property

Quoted 1 line

Thanks,
- Kever

Quoted 189 lines

---
  arch/arm/dts/rk3288-thermal.dtsi | 87 -------------------------------- arch/arm/dts/rk3288.dtsi         | 74 ++++++++++++++++++++++++++-

  2 files changed, 73 insertions(+), 88 deletions(-)

  delete mode 100644 arch/arm/dts/rk3288-thermal.dtsi

arch/arm/dts/rk3288-thermal.dtsi deleted +0 -87
deleted file mode 100644
index 87dd8142..00000000
@@ -1,87 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Device Tree Source for RK3288 SoC thermal
- *
- * Copyright (c) 2014, Fuzhou Rockchip Electronics Co., Ltd
- */
-
-#include <dt-bindings/thermal/thermal.h>
-
-reserve_thermal: reserve_thermal {
-    polling-delay-passive = <1000>; /* milliseconds */
-    polling-delay = <5000>; /* milliseconds */
-
-            /* sensor    ID */
-    thermal-sensors = <&tsadc    0>;
-
-};
-
-cpu_thermal: cpu_thermal {
-    polling-delay-passive = <100>; /* milliseconds */
-    polling-delay = <5000>; /* milliseconds */
-
-            /* sensor    ID */
-    thermal-sensors = <&tsadc    1>;
-    linux,hwmon;
-
-    trips {
-        cpu_alert0: cpu_alert0 {
-            temperature = <70000>; /* millicelsius */
-            hysteresis = <2000>; /* millicelsius */
-            type = "passive";
-        };
-        cpu_alert1: cpu_alert1 {
-            temperature = <75000>; /* millicelsius */
-            hysteresis = <2000>; /* millicelsius */
-            type = "passive";
-        };
-        cpu_crit: cpu_crit {
-            temperature = <100000>; /* millicelsius */
-            hysteresis = <2000>; /* millicelsius */
-            type = "critical";
-        };
-    };
-
-    cooling-maps {
-        map0 {
-            trip = <&cpu_alert0>;
-            cooling-device =
-                <&cpu0 THERMAL_NO_LIMIT 6>;
-        };
-        map1 {
-            trip = <&cpu_alert1>;
-            cooling-device =
-                <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
-        };
-    };
-};
-
-gpu_thermal: gpu_thermal {
-    polling-delay-passive = <100>; /* milliseconds */
-    polling-delay = <5000>; /* milliseconds */
-
-            /* sensor    ID */
-    thermal-sensors = <&tsadc    2>;
-    linux,hwmon;
-
-    trips {
-        gpu_alert0: gpu_alert0 {
-            temperature = <80000>; /* millicelsius */
-            hysteresis = <2000>; /* millicelsius */
-            type = "passive";
-        };
-        gpu_crit: gpu_crit {
-            temperature = <100000>; /* millicelsius */
-            hysteresis = <2000>; /* millicelsius */
-            type = "critical";
-        };
-    };
-
-    cooling-maps {
-        map0 {
-            trip = <&gpu_alert0>;
-            cooling-device =
-                <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
-        };
-    };
-};
arch/arm/dts/rk3288.dtsi +72 -1
index 9fb6d86b..c46741b0 100644
@@ -339,7 +339,78 @@
       };
         thermal: thermal-zones {
-        #include "rk3288-thermal.dtsi"
+        reserve_thermal: reserve-thermal {
+            polling-delay-passive = <1000>; /* milliseconds */
+            polling-delay = <5000>; /* milliseconds */
+
+            thermal-sensors = <&tsadc 0>;
+        };
+
+        cpu_thermal: cpu-thermal {
+            polling-delay-passive = <100>; /* milliseconds */
+            polling-delay = <5000>; /* milliseconds */
+
+            thermal-sensors = <&tsadc 1>;
+
+            trips {
+                cpu_alert0: cpu_alert0 {
+                    temperature = <70000>; /* millicelsius */
+                    hysteresis = <2000>; /* millicelsius */
+                    type = "passive";
+                };
+                cpu_alert1: cpu_alert1 {
+                    temperature = <75000>; /* millicelsius */
+                    hysteresis = <2000>; /* millicelsius */
+                    type = "passive";
+                };
+                cpu_crit: cpu_crit {
+                    temperature = <90000>; /* millicelsius */
+                    hysteresis = <2000>; /* millicelsius */
+                    type = "critical";
+                };
+            };
+
+            cooling-maps {
+                map0 {
+                    trip = <&cpu_alert0>;
+                    cooling-device =
+                        <&cpu0 THERMAL_NO_LIMIT 6>;
+                };
+                map1 {
+                    trip = <&cpu_alert1>;
+                    cooling-device =
+                        <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+                };
+            };
+        };
+
+        gpu_thermal: gpu-thermal {
+            polling-delay-passive = <100>; /* milliseconds */
+            polling-delay = <5000>; /* milliseconds */
+
+            thermal-sensors = <&tsadc 2>;
+
+            trips {
+                gpu_alert0: gpu_alert0 {
+                    temperature = <70000>; /* millicelsius */
+                    hysteresis = <2000>; /* millicelsius */
+                    type = "passive";
+                };
+                gpu_crit: gpu_crit {
+                    temperature = <90000>; /* millicelsius */
+                    hysteresis = <2000>; /* millicelsius */
+                    type = "critical";
+                };
+            };
+
+            cooling-maps {
+                map0 {
+                    trip = <&gpu_alert0>;
+                    cooling-device =
+                        <&gpu THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+                };
+            };
+        };
       };
         tsadc: tsadc@ff280000 {
@@ -849,6 +920,7 @@
               /* 500000 1200000 - See crosbug.com/p/33857 */

              600000 1250000
          >;
+        #cooling-cells = <2>; /* min followed by max */ power-domains = <&power RK3288_PD_GPU>; status = "disabled";
      };