lkml.org 
[lkml]   [2020]   [Feb]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.5 170/542] arm64: dts: rockchip: Fix NanoPC-T4 cooling maps
    Date
    From: Robin Murphy <robin.murphy@arm.com>

    [ Upstream commit a793e19c15f25a126138ac4ae9facf9204754af3 ]

    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 <robin.murphy@arm.com>
    Link: https://lore.kernel.org/r/5bb39f3115df1a487d717d3ae87e523b03749379.1573908197.git.robin.murphy@arm.com
    Signed-off-by: Heiko Stuebner <heiko@sntech.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    .../boot/dts/rockchip/rk3399-nanopc-t4.dts | 27 -------------------
    1 file changed, 27 deletions(-)

    diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts b/arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts
    index 2a127985ab171..d3ed8e5e770f1 100644
    --- a/arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts
    +++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts
    @@ -94,33 +94,6 @@
    };
    };

    -&gpu_thermal {
    - trips {
    - gpu_warm: gpu_warm {
    - temperature = <55000>;
    - hysteresis = <2000>;
    - type = "active";
    - };
    -
    - gpu_hot: gpu_hot {
    - temperature = <65000>;
    - hysteresis = <2000>;
    - type = "active";
    - };
    - };
    - cooling-maps {
    - map1 {
    - trip = <&gpu_warm>;
    - cooling-device = <&fan THERMAL_NO_LIMIT 1>;
    - };
    -
    - map2 {
    - trip = <&gpu_hot>;
    - cooling-device = <&fan 2 THERMAL_NO_LIMIT>;
    - };
    - };
    -};
    -
    &pinctrl {
    ir {
    ir_rx: ir-rx {
    --
    2.20.1
    \
     
     \ /
      Last update: 2020-02-14 16:53    [W:4.050 / U:0.448 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site