arm64: dts: rockchip: cleanup cpu_thermal node of rk3399-rock960.dts
Subsystems (2)
PATCH v2 1/1 arm64: dts: rockchip: cleanup cpu_thermal node of rk3399-rock960.dts
The cpu_thermal node in the rk3399-rock960.dts file does not reference &cpu_thermal directly to add the board-specific parts, but also repeats all the SoC default properties.
Clean the whole thing up and fix alignment.
Place new nodes in the correct alphabetical order. Compered to rk3399.dtsi the temperature property in cpu_alert0 changes from <70000> to <65000>.
A sustainable-power property was added.
The trip property in cooling map0 points to <&cpu_alert1> instead of <&cpu_alert0>.
--- arch/arm64/boot/dts/rockchip/rk3399-rock960.dts | 53 +++++++------------------ 1 file changed, 14 insertions(+), 39 deletions(-)
arch/arm64/boot/dts/rockchip/rk3399-rock960.dts +14 -39
@@ -63,6 +63,20 @@ }; +&cpu_alert0 { + temperature = <65000>; +}; + +&cpu_thermal { + sustainable-power = <1550>; + + cooling-maps { + map0 { + trip = <&cpu_alert1>; + }; + }; +}; + &pcie0 { ep-gpios = <&gpio2 RK_PA2 GPIO_ACTIVE_HIGH>; };
@@ -125,45 +139,6 @@ status = "okay"; }; -&thermal_zones { - cpu_thermal: cpu-thermal { - polling-delay-passive = <100>; - polling-delay = <1000>; - thermal-sensors = <&tsadc 0>; - sustainable-power = <1550>; - - trips { - cpu_alert0: cpu_alert0 { - temperature = <65000>; - hysteresis = <2000>; - type = "passive"; - }; - - cpu_alert1: cpu_alert1 { - temperature = <75000>; - hysteresis = <2000>; - type = "passive"; - }; - - cpu_crit: cpu_crit { - temperature = <95000>; - hysteresis = <2000>; - type = "critical"; - }; - }; - - cooling-maps { - map0 { - - trip = <&cpu_alert1>; - cooling-device = - <&cpu_b0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, - <&cpu_b1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; - }; - }; - }; -}; - &usbdrd_dwc3_0 { dr_mode = "otg"; };
Signature · 7 lines
2.11.0 _______________________________________________ Linux-rockchip mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-rockchip
Quoted 10 lines · Johan Jonker
The
cpu_thermalnode in therk3399-rock960.dtsfile does not reference&cpu_thermaldirectly to add the board-specific parts, but also repeats all the SoC default properties.
Clean the whole thing up and fix alignment.
Place new nodes in the correct alphabetical order. Compered tork3399.dtsithe temperature property incpu_alert0changes from <70000> to <65000>.
A sustainable-power property was added.
The trip property in cooling map0 points to <&cpu_alert1> instead of <&cpu_alert0>.
Applied, thanks!
[1/1] arm64: dts: rockchip: cleanup cpu_thermal node of rk3399-rock960.dts
commit: 376e46b5dd0ad9d06f029bbc4a66dd25dd059597
Best regards,
Signature · 6 lines
Heiko Stuebner <[email protected]> _______________________________________________ Linux-rockchip mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-rockchip