From a52b2d4241a147d5c6d273aac77d3e530c9e2253 Mon Sep 17 00:00:00 2001
From: Gopala Krishna Nuthaki <gnuthaki@qti.qualcomm.com>
Date: Fri, 18 Feb 2022 10:23:36 +0530
Subject: [PATCH] ARM: dts: qcom: Update skin and nsp Tj based config for
 diwali

Update gpu, cdsp based config mitiation rules for quiet-therm
and NSP thermal zones as per latest recommondation for diwali.

Change-Id: I04e7ffaeb74f8675281b34036f935df4ecbdc294
---
 qcom/diwali-atp.dtsi     |  1 +
 qcom/diwali-idp.dtsi     |  1 +
 qcom/diwali-qrd.dtsi     | 51 ++++++++++++++++++++++++++++++++++++++++
 qcom/diwali-thermal.dtsi | 51 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 104 insertions(+)

diff --git a/qcom/diwali-atp.dtsi b/qcom/diwali-atp.dtsi
index be2a8ab4..a41ff2b7 100644
--- a/qcom/diwali-atp.dtsi
+++ b/qcom/diwali-atp.dtsi
@@ -3,6 +3,7 @@
 
 #include "diwali-pm7250b.dtsi"
 #include "diwali-pmic-overlay.dtsi"
+#include "diwali-thermal-overlay.dtsi"
 
 &soc {
 	gpio_keys {
diff --git a/qcom/diwali-idp.dtsi b/qcom/diwali-idp.dtsi
index f162c439..7c425342 100644
--- a/qcom/diwali-idp.dtsi
+++ b/qcom/diwali-idp.dtsi
@@ -2,6 +2,7 @@
 #include <dt-bindings/input/input.h>
 
 #include "diwali-pmic-overlay.dtsi"
+#include "diwali-thermal-overlay.dtsi"
 
 &soc {
 	gpio_keys {
diff --git a/qcom/diwali-qrd.dtsi b/qcom/diwali-qrd.dtsi
index 8acc30d8..981c8023 100644
--- a/qcom/diwali-qrd.dtsi
+++ b/qcom/diwali-qrd.dtsi
@@ -173,3 +173,54 @@
 		pinctrl-1 = <&nfc_int_suspend &nfc_enable_suspend>;
 	};
 };
+
+&thermal_zones {
+	quiet-therm {
+		polling-delay-passive = <100>;
+
+		trips {
+			apc_trip:apc-trip {
+				temperature = <45000>;
+				hysteresis = <0>;
+				type = "passive";
+			};
+
+			gpu_trip:gpu-trip {
+				temperature = <47000>;
+				hysteresis = <0>;
+				type = "passive";
+			};
+
+			cx_trip:cx-trip {
+				temperature = <55000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+
+		cooling-maps {
+			apc_cdev {
+				trip = <&apc_trip>;
+				cooling-device = <&apc1_cluster 0 5>;
+			};
+
+			gpu_cdev1 {
+				trip = <&gpu_trip>;
+				/* Limit freq to 540000000 Hz*/
+				cooling-device = <&msm_gpu 0 3>;
+			};
+
+			gpu_cdev2 {
+				trip = <&cx_trip>;
+				/* Limit freq to 285000000 Hz*/
+				cooling-device = <&msm_gpu 5 5>;
+			};
+
+			cdsp_cdev {
+				trip = <&cx_trip>;
+				cooling-device = <&cdsp_sw 6 6>;
+			};
+		};
+	};
+};
+
diff --git a/qcom/diwali-thermal.dtsi b/qcom/diwali-thermal.dtsi
index 39a1c0e4..0fd7a433 100644
--- a/qcom/diwali-thermal.dtsi
+++ b/qcom/diwali-thermal.dtsi
@@ -879,6 +879,12 @@
 				hysteresis = <5000>;
 				type = "passive";
 			};
+
+			nspss_0_config0: junction-config0 {
+				temperature = <100000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
 		};
 
 		cooling-maps {
@@ -887,6 +893,17 @@
 				cooling-device = <&cdsp_sw THERMAL_NO_LIMIT
 							THERMAL_NO_LIMIT>;
 			};
+
+			nsp_cdev1 {
+				trip = <&nspss_0_config0>;
+				cooling-device = <&cdsp_sw 6 6>;
+			};
+
+			gpu_cdev {
+				trip = <&nspss_0_config0>;
+				/* Limit freq to 285000000 Hz*/
+				cooling-device = <&msm_gpu 5 5>;
+			};
 		};
 	};
 
@@ -918,6 +935,12 @@
 				hysteresis = <5000>;
 				type = "passive";
 			};
+
+			nspss_1_config1: junction-config1 {
+				temperature = <100000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
 		};
 
 		cooling-maps {
@@ -926,6 +949,17 @@
 				cooling-device = <&cdsp_sw THERMAL_NO_LIMIT
 							THERMAL_NO_LIMIT>;
 			};
+
+			nsp_cdev1 {
+				trip = <&nspss_1_config1>;
+				cooling-device = <&cdsp_sw 6 6>;
+			};
+
+			gpu_cdev {
+				trip = <&nspss_1_config1>;
+				/* Limit freq to 285000000 Hz*/
+				cooling-device = <&msm_gpu 5 5>;
+			};
 		};
 	};
 
@@ -957,6 +991,12 @@
 				hysteresis = <5000>;
 				type = "passive";
 			};
+
+			nspss_2_config1: junction-config2 {
+				temperature = <100000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
 		};
 
 		cooling-maps {
@@ -965,6 +1005,17 @@
 				cooling-device = <&cdsp_sw THERMAL_NO_LIMIT
 							THERMAL_NO_LIMIT>;
 			};
+
+			nsp_cdev1 {
+				trip = <&nspss_2_config1>;
+				cooling-device = <&cdsp_sw 6 6>;
+			};
+
+			gpu_cdev {
+				trip = <&nspss_2_config1>;
+				/* Limit freq to 285000000 Hz*/
+				cooling-device = <&msm_gpu 5 5>;
+			};
 		};
 	};