From: Chungwoo Park <cww.park@samsung.com>
Date: Tue, 15 May 2018 12:51:45 +0000 (+0900)
Subject: [9610] arm64: dtsi: Modify thermal cooling device setting.
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=55ce8bb762d99c03ab2cf1d0d67ca1ece152c7a0;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

[9610] arm64: dtsi: Modify thermal cooling device setting.

Change-Id: I9eb17a42a4457001f471407486e109853004a8f0
Signed-off-by: Chungwoo Park <cww.park@samsung.com>
---

diff --git a/arch/arm64/boot/dts/exynos/exynos9610.dtsi b/arch/arm64/boot/dts/exynos/exynos9610.dtsi
index d11aac52e01b..417e36e02a6e 100644
--- a/arch/arm64/boot/dts/exynos/exynos9610.dtsi
+++ b/arch/arm64/boot/dts/exynos/exynos9610.dtsi
@@ -156,7 +156,6 @@
 			enable-method = "psci";
 			cpu-idle-states = <&BOOTCL_CPU_SLEEP>;
 			sched-energy-data = <&A53_ENERGY>;
-			#cooling-cells = <2>; /* min followed by max */
 		};
 		cpu1: cpu@101 {
 			device_type = "cpu";
@@ -189,7 +188,6 @@
 			enable-method = "psci";
 			cpu-idle-states = <&NONBOOTCL_CPU_SLEEP>;
 			sched-energy-data = <&A73_ENERGY>;
-			#cooling-cells = <2>; /* min followed by max */
 		};
 		cpu5: cpu@1 {
 			device_type = "cpu";
@@ -1779,7 +1777,7 @@
 			cooling-maps {
 				map0 {
 				     trip = <&big_control_temp>;
-				     cooling-device = <&cpu4 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+				     cooling-device = <&cpufreq_domain1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
 			       };
 			};
 		};
@@ -1837,42 +1835,42 @@
 				map0 {
 				     trip = <&little_alert0>;
 				     /* Corresponds to 1534MHz at freq_table */
-				     cooling-device = <&cpu0 0 0>;
+				     cooling-device = <&cpufreq_domain0 0 0>;
 				};
 				map1 {
 				     trip = <&little_alert1>;
 				     /* Corresponds to 1326MHz at freq_table */
-				     cooling-device = <&cpu0 0 0>;
+				     cooling-device = <&cpufreq_domain0 0 0>;
 			       };
 				map2 {
 				     trip = <&little_alert2>;
 				     /* Corresponds to 1118MHz at freq_table */
-				     cooling-device = <&cpu0 0 0>;
+				     cooling-device = <&cpufreq_domain0 0 0>;
 				};
 				map3 {
 				     trip = <&little_alert3>;
 				     /* Corresponds to 910MHz at freq_table */
-				     cooling-device = <&cpu0 0 0>;
+				     cooling-device = <&cpufreq_domain0 0 0>;
 				};
 				map4 {
 				     trip = <&little_alert4>;
 				     /* Corresponds to 702MHz at freq_table */
-				     cooling-device = <&cpu0 0 0>;
+				     cooling-device = <&cpufreq_domain0 0 0>;
 				};
 				map5 {
 				     trip = <&little_alert5>;
 				     /* Corresponds to 403MHz at freq_table */
-				     cooling-device = <&cpu0 0 0>;
+				     cooling-device = <&cpufreq_domain0 0 0>;
 			       };
 				map6 {
 				     trip = <&little_alert6>;
 				     /* Corresponds to 403MHz at freq_table */
-				     cooling-device = <&cpu0 0 0>;
+				     cooling-device = <&cpufreq_domain0 0 0>;
 				};
 				map7 {
 				     trip = <&little_hot>;
 				     /* Corresponds to 403MHz at freq_table */
-				     cooling-device = <&cpu0 0 0>;
+				     cooling-device = <&cpufreq_domain0 0 0>;
 				};
 			};
 		};
@@ -2603,7 +2601,7 @@
 	};
 
 	cpufreq {
-		domain@0 {
+		cpufreq_domain0: domain@0 {
 			device_type = "cpufreq-domain";
 			sibling-cpus = "0-3";
 			cal-id = <ACPM_DVFS_CPUCL0>;
@@ -2615,6 +2613,8 @@
 			pm_qos-min-class = <3>;
 			pm_qos-max-class = <4>;
 
+			#cooling-cells = <2>; /* min followed by max */
+
 			dm-constraints {
 				mif-perf {
 					const-type = <CONSTRAINT_MIN>;
@@ -2636,7 +2636,7 @@
 			};
 		};
 
-		domain@1 {
+		cpufreq_domain1: domain@1 {
 			device_type = "cpufreq-domain";
 			sibling-cpus = "4-7";
 			cal-id = <ACPM_DVFS_CPUCL1>;
@@ -2649,6 +2649,8 @@
 			pm_qos-min-class = <5>;
 			pm_qos-max-class = <6>;
 
+			#cooling-cells = <2>; /* min followed by max */
+
 			dm-constraints {
 				mif-perf {
 					const-type = <CONSTRAINT_MIN>;