From 77df51256ca6dbd4f20e57814de9151b12631b67 Mon Sep 17 00:00:00 2001
From: Minghao Zhang <minghao@qti.qualcomm.com>
Date: Wed, 2 Nov 2022 18:46:23 +0800
Subject: [PATCH] ARM: dts: qcom: Update cpu, gpu and usb-therm mitigation
 rules on Kalama HHG

Update cpu, gpu and usb-therm mitigation rules based on the latest
recommendation.

Change-Id: I981fa2bb0dedc671b3ed90bf31b8ff7a2fa44b2d
---
 qcom/kalama-sg-hhg.dtsi | 104 +++++++++++++++++++++++++++++++++-------
 1 file changed, 88 insertions(+), 16 deletions(-)

diff --git a/qcom/kalama-sg-hhg.dtsi b/qcom/kalama-sg-hhg.dtsi
index 42c9480c..6af80349 100644
--- a/qcom/kalama-sg-hhg.dtsi
+++ b/qcom/kalama-sg-hhg.dtsi
@@ -157,7 +157,7 @@
 		};
 	};
 
-	cpu-1-6 {
+	cpu-1-9 {
 		trips {
 			thermal-engine-config {
 				temperature = <125000>;
@@ -171,22 +171,33 @@
 				type = "passive";
 			};
 
-			fan_cpu16_config0: fan-cpu16-config0 {
-				temperature = <95000>;
-				hysteresis = <5000>;
+			fan_cpu19_config0: fan-cpu19-config0 {
+				temperature = <85000>;
+				hysteresis = <0>;
+				type = "passive";
+			};
+
+			fan_cpu19_config1: fan-cpu19-config1 {
+				temperature = <90000>;
+				hysteresis = <0>;
 				type = "passive";
 			};
 		};
 
 		cooling-maps {
 			fan_cdev_0 {
-				trip = <&fan_cpu16_config0>;
-				cooling-device = <&fancontroller 1 1>;
+				trip = <&fan_cpu19_config0>;
+				cooling-device = <&fancontroller 2 2>;
+			};
+
+			fan_cdev_1 {
+				trip = <&fan_cpu19_config1>;
+				cooling-device = <&fancontroller 3 3>;
 			};
 		};
 	};
 
-	cpu-1-7 {
+	cpu-1-10 {
 		trips {
 			thermal-engine-config {
 				temperature = <125000>;
@@ -200,17 +211,28 @@
 				type = "passive";
 			};
 
-			fan_cpu17_config0: fan-cpu17-config0 {
-				temperature = <95000>;
-				hysteresis = <5000>;
+			fan_cpu1a_config0: fan-cpu1a-config0 {
+				temperature = <85000>;
+				hysteresis = <0>;
+				type = "passive";
+			};
+
+			fan_cpu1a_config1: fan-cpu1a-config1 {
+				temperature = <90000>;
+				hysteresis = <0>;
 				type = "passive";
 			};
 		};
 
 		cooling-maps {
 			fan_cdev_0 {
-				trip = <&fan_cpu17_config0>;
-				cooling-device = <&fancontroller 1 1>;
+				trip = <&fan_cpu1a_config0>;
+				cooling-device = <&fancontroller 2 2>;
+			};
+
+			fan_cdev_1 {
+				trip = <&fan_cpu1a_config1>;
+				cooling-device = <&fancontroller 3 3>;
 			};
 		};
 	};
@@ -230,7 +252,13 @@
 			};
 
 			fan_gpuss0_config0: fan-gpuss0-config0 {
-				temperature = <95000>;
+				temperature = <70000>;
+				hysteresis = <0>;
+				type = "passive";
+			};
+
+			fan_gpuss0_config1: fan-gpuss0-config1 {
+				temperature = <90000>;
 				hysteresis = <0>;
 				type = "passive";
 			};
@@ -239,7 +267,12 @@
 		cooling-maps {
 			fan_cdev_0 {
 				trip = <&fan_gpuss0_config0>;
-				cooling-device = <&fancontroller 1 1>;
+				cooling-device = <&fancontroller 3 3>;
+			};
+
+			fan_cdev_1 {
+				trip = <&fan_gpuss0_config1>;
+				cooling-device = <&fancontroller 4 4>;
 			};
 		};
 	};
@@ -259,7 +292,13 @@
 			};
 
 			fan_gpuss1_config0: fan-gpuss1-config0 {
-				temperature = <95000>;
+				temperature = <70000>;
+				hysteresis = <0>;
+				type = "passive";
+			};
+
+			fan_gpuss1_config1: fan-gpuss1-config1 {
+				temperature = <90000>;
 				hysteresis = <0>;
 				type = "passive";
 			};
@@ -268,7 +307,40 @@
 		cooling-maps {
 			fan_cdev_0 {
 				trip = <&fan_gpuss1_config0>;
-				cooling-device = <&fancontroller 1 1>;
+				cooling-device = <&fancontroller 3 3>;
+			};
+
+			fan_cdev_1 {
+				trip = <&fan_gpuss1_config1>;
+				cooling-device = <&fancontroller 4 4>;
+			};
+		};
+	};
+
+	usb-therm {
+		trips {
+			fan_thmbat0_config0: fan-thmbat0-config0 {
+				temperature = <43000>;
+				hysteresis = <2000>;
+				type = "passive";
+			};
+
+			fan_thmbat1_config1: fan-thmbat1-config1 {
+				temperature = <45000>;
+				hysteresis = <3000>;
+				type = "passive";
+			};
+		};
+
+		cooling-maps {
+			fan_cdev_0 {
+				trip = <&fan_thmbat0_config0>;
+				cooling-device = <&fancontroller 3 3>;
+			};
+
+			fan_cdev_1 {
+				trip = <&fan_thmbat1_config1>;
+				cooling-device = <&fancontroller 4 4>;
 			};
 		};
 	};