jsauer/torvalds-linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-01-12 01:20:14 +00:00
Code

arm64: dts: rockchip: move cpu_thermal node to the correct position

Browse Source 
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
This commit is contained in:
Heiko Stuebner 2025-11-12 22:42:02 +01:00
parent 78f316e909
commit 15efa24146
1 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts
View File

@ -196,6 +196,54 @@
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>;
@ -492,54 +540,6 @@
};
};
/*
* 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";