]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
arm64: dts: rockchip: move cpu_thermal node to the correct position
authorHeiko Stuebner <heiko@sntech.de>
Wed, 12 Nov 2025 21:42:02 +0000 (22:42 +0100)
committerHeiko Stuebner <heiko@sntech.de>
Thu, 20 Nov 2025 19:46:32 +0000 (20:46 +0100)
The &cpu_thermal node was added at the wrong position, move it to
the correctly sorted one.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Link: https://patch.msgid.link/20251112214206.423244-2-heiko@sntech.de
arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts

index 6ae4316761c43911368037b2dfc4bbce74b34a58..5656554ca2840bca8c5cba8bd4b000341c3b776c 100644 (file)
        cpu-supply = <&vdd_cpu>;
 };
 
+/*
+ * The MCU can provide system temperature too, but only by polling and of
+ * course also cannot set trip points. So attach to the cpu thermal-zone
+ * instead to control the fan.
+ */
+&cpu_thermal {
+       trips {
+               case_fan0: case-fan0 {
+                       hysteresis = <2000>;
+                       temperature = <35000>;
+                       type = "active";
+               };
+
+               case_fan1: case-fan1 {
+                       hysteresis = <2000>;
+                       temperature = <45000>;
+                       type = "active";
+               };
+
+               case_fan2: case-fan2 {
+                       hysteresis = <2000>;
+                       temperature = <65000>;
+                       type = "active";
+               };
+       };
+
+       cooling-maps {
+               /*
+                * Always provide some air movement, due to small case
+                * full of harddrives.
+                */
+               map1 {
+                       cooling-device = <&fan THERMAL_NO_LIMIT 1>;
+                       trip = <&case_fan0>;
+               };
+
+               map2 {
+                       cooling-device = <&fan 2 3>;
+                       trip = <&case_fan1>;
+               };
+
+               map3 {
+                       cooling-device = <&fan 4 THERMAL_NO_LIMIT>;
+                       trip = <&case_fan2>;
+               };
+       };
+};
+
 &gmac0 {
        assigned-clocks = <&cru SCLK_GMAC0_RX_TX>, <&cru SCLK_GMAC0>;
        assigned-clock-parents = <&cru SCLK_GMAC0_RGMII_SPEED>, <&cru CLK_MAC0_2TOP>;
        };
 };
 
-/*
- * The MCU can provide system temperature too, but only by polling and of
- * course also cannot set trip points. So attach to the cpu thermal-zone
- * instead to control the fan.
- */
-&cpu_thermal {
-       trips {
-               case_fan0: case-fan0 {
-                       hysteresis = <2000>;
-                       temperature = <35000>;
-                       type = "active";
-               };
-
-               case_fan1: case-fan1 {
-                       hysteresis = <2000>;
-                       temperature = <45000>;
-                       type = "active";
-               };
-
-               case_fan2: case-fan2 {
-                       hysteresis = <2000>;
-                       temperature = <65000>;
-                       type = "active";
-               };
-       };
-
-       cooling-maps {
-               /*
-                * Always provide some air movement, due to small case
-                * full of harddrives.
-                */
-               map1 {
-                       cooling-device = <&fan THERMAL_NO_LIMIT 1>;
-                       trip = <&case_fan0>;
-               };
-
-               map2 {
-                       cooling-device = <&fan 2 3>;
-                       trip = <&case_fan1>;
-               };
-
-               map3 {
-                       cooling-device = <&fan 4 THERMAL_NO_LIMIT>;
-                       trip = <&case_fan2>;
-               };
-       };
-};
-
 &pcie30phy {
        data-lanes = <1 2>;
        status = "okay";