From 47c7070914f1234213cc3419b7bcf3b53e8b72ad Mon Sep 17 00:00:00 2001
From: Minghao Zhang <minghao@qti.qualcomm.com>
Date: Wed, 17 Mar 2021 15:30:43 +0800
Subject: [PATCH] ARM: dts: qcom: Update CPU and GPU mitigation rules on
 Lahaina HHG

Update cpu-1-6-step and cpu-1-7-step thermal zone mitigation rules
with CPU and gpuss-0-step and gpuss-1-step thermal zone mitigation
rules with GPU based on the latest recommendation.

Change-Id: I5721575cac197b976867aa78b98ed5694316d6f0
---
 qcom/lahaina-hhg.dtsi | 108 +++++++++++++-----------------------------
 1 file changed, 32 insertions(+), 76 deletions(-)

diff --git a/qcom/lahaina-hhg.dtsi b/qcom/lahaina-hhg.dtsi
index 386367957b73..4205dd82791d 100644
--- a/qcom/lahaina-hhg.dtsi
+++ b/qcom/lahaina-hhg.dtsi
@@ -115,25 +115,19 @@
 	cpu-1-6-step {
 		trips {
 			fan_cpu16_config0: fan-cpu16-config0 {
-				temperature = <50000>;
-				hysteresis = <0>;
+				temperature = <80000>;
+				hysteresis = <5000>;
 				type = "passive";
 			};
 
 			fan_cpu16_config1: fan-cpu16-config1 {
-				temperature = <65000>;
-				hysteresis = <0>;
+				temperature = <90000>;
+				hysteresis = <5000>;
 				type = "passive";
 			};
 
 			fan_cpu16_config2: fan-cpu16-config2 {
-				temperature = <80000>;
-				hysteresis = <0>;
-				type = "passive";
-			};
-
-			fan_cpu16_config3: fan-cpu16-config3 {
-				temperature = <90000>;
+				temperature = <95000>;
 				hysteresis = <0>;
 				type = "passive";
 			};
@@ -142,22 +136,17 @@
 		cooling-maps {
 			fan_cdev_0 {
 				trip = <&fan_cpu16_config0>;
-				cooling-device = <&fancontroller 0 1>;
+				cooling-device = <&fancontroller 1 1>;
 			};
 
 			fan_cdev_1 {
 				trip = <&fan_cpu16_config1>;
-				cooling-device = <&fancontroller 1 2>;
+				cooling-device = <&fancontroller 2 2>;
 			};
 
 			fan_cdev_2 {
 				trip = <&fan_cpu16_config2>;
-				cooling-device = <&fancontroller 2 3>;
-			};
-
-			fan_cdev_3 {
-				trip = <&fan_cpu16_config3>;
-				cooling-device = <&fancontroller 3 4>;
+				cooling-device = <&fancontroller 3 3>;
 			};
 		};
 	};
@@ -165,25 +154,19 @@
 	cpu-1-7-step {
 		trips {
 			fan_cpu17_config0: fan-cpu17-config0 {
-				temperature = <50000>;
-				hysteresis = <0>;
+				temperature = <80000>;
+				hysteresis = <5000>;
 				type = "passive";
 			};
 
 			fan_cpu17_config1: fan-cpu17-config1 {
-				temperature = <65000>;
-				hysteresis = <0>;
+				temperature = <90000>;
+				hysteresis = <5000>;
 				type = "passive";
 			};
 
 			fan_cpu17_config2: fan-cpu17-config2 {
-				temperature = <80000>;
-				hysteresis = <0>;
-				type = "passive";
-			};
-
-			fan_cpu17_config3: fan-cpu17-config3 {
-				temperature = <90000>;
+				temperature = <95000>;
 				hysteresis = <0>;
 				type = "passive";
 			};
@@ -192,22 +175,17 @@
 		cooling-maps {
 			fan_cdev_0 {
 				trip = <&fan_cpu17_config0>;
-				cooling-device = <&fancontroller 0 1>;
+				cooling-device = <&fancontroller 1 1>;
 			};
 
 			fan_cdev_1 {
 				trip = <&fan_cpu17_config1>;
-				cooling-device = <&fancontroller 1 2>;
+				cooling-device = <&fancontroller 2 2>;
 			};
 
 			fan_cdev_2 {
 				trip = <&fan_cpu17_config2>;
-				cooling-device = <&fancontroller 2 3>;
-			};
-
-			fan_cdev_3 {
-				trip = <&fan_cpu17_config3>;
-				cooling-device = <&fancontroller 3 4>;
+				cooling-device = <&fancontroller 3 3>;
 			};
 		};
 	};
@@ -215,25 +193,19 @@
 	gpuss-0-step {
 		trips {
 			fan_gpuss0_config0: fan-gpuss0-config0 {
-				temperature = <50000>;
-				hysteresis = <0>;
+				temperature = <85000>;
+				hysteresis = <5000>;
 				type = "passive";
 			};
 
 			fan_gpuss0_config1: fan-gpuss0-config1 {
-				temperature = <65000>;
-				hysteresis = <0>;
+				temperature = <90000>;
+				hysteresis = <5000>;
 				type = "passive";
 			};
 
 			fan_gpuss0_config2: fan-gpuss0-config2 {
-				temperature = <80000>;
-				hysteresis = <0>;
-				type = "passive";
-			};
-
-			fan_gpuss0_config3: fan-gpuss0-config3 {
-				temperature = <90000>;
+				temperature = <95000>;
 				hysteresis = <0>;
 				type = "passive";
 			};
@@ -242,22 +214,17 @@
 		cooling-maps {
 			fan_cdev_0 {
 				trip = <&fan_gpuss0_config0>;
-				cooling-device = <&fancontroller 0 1>;
+				cooling-device = <&fancontroller 1 1>;
 			};
 
 			fan_cdev_1 {
 				trip = <&fan_gpuss0_config1>;
-				cooling-device = <&fancontroller 1 2>;
+				cooling-device = <&fancontroller 2 2>;
 			};
 
 			fan_cdev_2 {
 				trip = <&fan_gpuss0_config2>;
-				cooling-device = <&fancontroller 2 3>;
-			};
-
-			fan_cdev_3 {
-				trip = <&fan_gpuss0_config3>;
-				cooling-device = <&fancontroller 3 4>;
+				cooling-device = <&fancontroller 3 3>;
 			};
 		};
 	};
@@ -265,25 +232,19 @@
 	gpuss-1-step {
 		trips {
 			fan_gpuss1_config0: fan-gpuss1-config0 {
-				temperature = <50000>;
-				hysteresis = <0>;
+				temperature = <85000>;
+				hysteresis = <5000>;
 				type = "passive";
 			};
 
 			fan_gpuss1_config1: fan-gpuss1-config1 {
-				temperature = <65000>;
-				hysteresis = <0>;
+				temperature = <90000>;
+				hysteresis = <5000>;
 				type = "passive";
 			};
 
 			fan_gpuss1_config2: fan-gpuss1-config2 {
-				temperature = <80000>;
-				hysteresis = <0>;
-				type = "passive";
-			};
-
-			fan_gpuss1_config3: fan-gpuss1-config3 {
-				temperature = <90000>;
+				temperature = <95000>;
 				hysteresis = <0>;
 				type = "passive";
 			};
@@ -292,22 +253,17 @@
 		cooling-maps {
 			fan_cdev_0 {
 				trip = <&fan_gpuss1_config0>;
-				cooling-device = <&fancontroller 0 1>;
+				cooling-device = <&fancontroller 1 1>;
 			};
 
 			fan_cdev_1 {
 				trip = <&fan_gpuss1_config1>;
-				cooling-device = <&fancontroller 1 2>;
+				cooling-device = <&fancontroller 2 2>;
 			};
 
 			fan_cdev_2 {
 				trip = <&fan_gpuss1_config2>;
-				cooling-device = <&fancontroller 2 3>;
-			};
-
-			fan_cdev_3 {
-				trip = <&fan_gpuss1_config3>;
-				cooling-device = <&fancontroller 3 4>;
+				cooling-device = <&fancontroller 3 3>;
 			};
 		};
 	};