Skip to content

Commit 358bd73

Browse files
rmurphy-armgregkh
authored andcommitted
arm64: dts: rockchip: Fix NanoPC-T4 cooling maps
[ Upstream commit a793e19 ] Although it appeared to follow logically from the bindings, apparently the thermal framework can't properly cope with a single cooling device being shared between multiple maps. The CPU zone is probably easier to overheat, so remove the references to the (optional) fan from the GPU cooling zone to avoid things getting confused. Hopefully GPU-intensive tasks will leak enough heat across to the CPU zone to still hit the fan trips before reaching critical GPU temperatures. Signed-off-by: Robin Murphy <[email protected]> Link: https://lore.kernel.org/r/5bb39f3115df1a487d717d3ae87e523b03749379.1573908197.git.robin.murphy@arm.com Signed-off-by: Heiko Stuebner <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent b0d2ada commit 358bd73

File tree

1 file changed

+0
-27
lines changed

1 file changed

+0
-27
lines changed

arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -94,33 +94,6 @@
9494
};
9595
};
9696

97-
&gpu_thermal {
98-
trips {
99-
gpu_warm: gpu_warm {
100-
temperature = <55000>;
101-
hysteresis = <2000>;
102-
type = "active";
103-
};
104-
105-
gpu_hot: gpu_hot {
106-
temperature = <65000>;
107-
hysteresis = <2000>;
108-
type = "active";
109-
};
110-
};
111-
cooling-maps {
112-
map1 {
113-
trip = <&gpu_warm>;
114-
cooling-device = <&fan THERMAL_NO_LIMIT 1>;
115-
};
116-
117-
map2 {
118-
trip = <&gpu_hot>;
119-
cooling-device = <&fan 2 THERMAL_NO_LIMIT>;
120-
};
121-
};
122-
};
123-
12497
&pinctrl {
12598
ir {
12699
ir_rx: ir-rx {

0 commit comments

Comments
 (0)