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>.

Suggested-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Johan Jonker <jbx6244@gmail.com>
Link: https://lore.kernel.org/r/20210118180054.9360-1-jbx6244@gmail.com
Signed-off-by: Heiko Stuebner <heiko@sntech.de>

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dts
index b207740819ef7de9aad5a1b291d21dc2b6bd583a..1a23e8f3cdf65d9dbbcc1beb2249b937c59101e0 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dts
@@ -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";
 };