From: Rocky Hao <rocky.hao@rock-chips.com>
Date: Tue, 21 Mar 2017 02:54:12 +0000 (+0800)
Subject: arm64: dts: rockchip: update thermal config for rk3368
X-Git-Tag: firefly_0821_release~271
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=firefly-linux-kernel-4.4.55.git;a=commitdiff_plain;h=92f81f9d0455685c4d1d2b44745a5f660779372a;hp=7ad1fc1c430cde9af8a78e71e2f9961aa30a2a52

arm64: dts: rockchip: update thermal config for rk3368

add cpus' dynamic power coefficient and update alert temperature

Change-Id: I502e49d52268b63625e01103b50e6c18fb8da8b0
Signed-off-by: Rocky Hao <rocky.hao@rock-chips.com>
---

diff --git a/arch/arm64/boot/dts/rockchip/rk3368.dtsi b/arch/arm64/boot/dts/rockchip/rk3368.dtsi
index 1c3eae584871..c34900d36c09 100644
--- a/arch/arm64/boot/dts/rockchip/rk3368.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3368.dtsi
@@ -132,8 +132,8 @@
 			enable-method = "psci";
 			clocks = <&cru ARMCLKL>;
 			operating-points-v2 = <&cluster0_opp>;
-
 			#cooling-cells = <2>; /* min followed by max */
+			dynamic-power-coefficient = <149>;
 		};
 
 		cpu_l1: cpu@1 {
@@ -174,8 +174,8 @@
 			enable-method = "psci";
 			clocks = <&cru ARMCLKB>;
 			operating-points-v2 = <&cluster1_opp>;
-
 			#cooling-cells = <2>; /* min followed by max */
+			dynamic-power-coefficient = <160>;
 		};
 
 		cpu_b1: cpu@101 {
@@ -602,14 +602,14 @@
 
 	thermal-zones {
 		cpu {
-			polling-delay-passive = <100>; /* milliseconds */
-			polling-delay = <5000>; /* milliseconds */
+			polling-delay-passive = <300>; /* milliseconds */
+			polling-delay = <300>; /* milliseconds */
+			sustainable-power = <600>; /* milliwatts */
 
 			thermal-sensors = <&tsadc 0>;
-
 			trips {
 				cpu_alert0: cpu_alert0 {
-					temperature = <75000>; /* millicelsius */
+					temperature = <70000>; /* millicelsius */
 					hysteresis = <2000>; /* millicelsius */
 					type = "passive";
 				};
@@ -619,7 +619,7 @@
 					type = "passive";
 				};
 				cpu_crit: cpu_crit {
-					temperature = <95000>; /* millicelsius */
+					temperature = <90000>; /* millicelsius */
 					hysteresis = <2000>; /* millicelsius */
 					type = "critical";
 				};
@@ -627,44 +627,24 @@
 
 			cooling-maps {
 				map0 {
-					trip = <&cpu_alert0>;
+					trip = <&cpu_alert1>;
 					cooling-device =
-					<&cpu_b0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+					<&cpu_l0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+					contribution = <1024>;
 				};
 				map1 {
 					trip = <&cpu_alert1>;
 					cooling-device =
-					<&cpu_l0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+					<&cpu_b0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+					contribution = <1024>;
 				};
 			};
 		};
 
-		gpu {
-			polling-delay-passive = <100>; /* milliseconds */
-			polling-delay = <5000>; /* milliseconds */
-
+		gpu_thermal: gpu-thermal {
+			polling-delay-passive = <300>; /* milliseconds */
+			polling-delay = <300>; /* milliseconds */
 			thermal-sensors = <&tsadc 1>;
-
-			trips {
-				gpu_alert0: gpu_alert0 {
-					temperature = <80000>; /* millicelsius */
-					hysteresis = <2000>; /* millicelsius */
-					type = "passive";
-				};
-				gpu_crit: gpu_crit {
-					temperature = <115000>; /* millicelsius */
-					hysteresis = <2000>; /* millicelsius */
-					type = "critical";
-				};
-			};
-
-			cooling-maps {
-				map0 {
-					trip = <&gpu_alert0>;
-					cooling-device =
-					<&cpu_b0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
-				};
-			};
 		};
 	};