From ab4bb0958b20acd14d4a8ba1fda823240f6f904f Mon Sep 17 00:00:00 2001
From: Manaf Meethalavalappu Pallikunhi <manafm@qti.qualcomm.com>
Date: Sun, 11 Sep 2022 01:31:55 +0530
Subject: [PATCH] ARM: dts: qcom: Enable userspace cpu and gpu cooling devices
 for khaje

Enable userspace cooling devices like cpuX, gpu etc. for khaje.

Update few thermal zone threshold and mitigation levels for khaje.

Change-Id: Id20435dd21420b65ca321e55f2f0b9a569c45661
---
 qcom/bengal-thermal.dtsi                | 18 +++++++++++-------
 qcom/khaje-qrd-pm7250b.dtsi             | 15 +++++++++++----
 qcom/khaje-qrd.dtsi                     | 15 +++++----------
 qcom/khaje-thermal-pm7250b-overlay.dtsi |  4 ++--
 4 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/qcom/bengal-thermal.dtsi b/qcom/bengal-thermal.dtsi
index a08ddd30..6b0301ca 100644
--- a/qcom/bengal-thermal.dtsi
+++ b/qcom/bengal-thermal.dtsi
@@ -1,6 +1,6 @@
 #include <dt-bindings/thermal/thermal_qti.h>
 
-&cpufreq_hw {
+&soc {
 	#address-cells = <1>;
 	#size-cells = <1>;
 	lmh_dcvs0: qcom,limits-dcvs@f521000 {
@@ -9,8 +9,6 @@
 		qcom,affinity = <0>;
 		reg = <0xf550800 0x1000>,
 			<0xf521000 0x1000>;
-		qcom,no-cooling-device-register;
-		#thermal-sensor-cells = <0>;
 	};
 
 	lmh_dcvs1: qcom,limits-dcvs@f523000 {
@@ -19,8 +17,6 @@
 		qcom,affinity = <1>;
 		reg = <0xf550800 0x1000>,
 			<0xf523000 0x1000>;
-		qcom,no-cooling-device-register;
-		#thermal-sensor-cells = <0>;
 	};
 
 	qcom,cpu-pause {
@@ -107,9 +103,7 @@
 			qcom,cdev-alias = "pause-cpu7";
 		};
 	};
-};
 
-&soc {
 	tsens0:tsens@c222000 {
 		compatible = "qcom,tsens24xx";
 		reg = <0x04410000  0x8>,
@@ -198,6 +192,16 @@
 		qcom,bypass-client-list = <0x1004 0x4004 0x6004 0xc004 0xc008>;
 		#cooling-cells = <2>;
 	};
+
+	qcom,devfreq-cdev {
+		compatible = "qcom,devfreq-cdev";
+		qcom,devfreq = <&msm_gpu>;
+	};
+
+	qcom,cpufreq-cdev {
+		compatible = "qcom,cpufreq-cdev";
+		qcom,cpus = <&CPU0 &CPU4>;
+	};
 };
 
 &thermal_zones {
diff --git a/qcom/khaje-qrd-pm7250b.dtsi b/qcom/khaje-qrd-pm7250b.dtsi
index f7195cb1..59ca0084 100644
--- a/qcom/khaje-qrd-pm7250b.dtsi
+++ b/qcom/khaje-qrd-pm7250b.dtsi
@@ -204,7 +204,7 @@
 };
 
 &thermal_zones {
-	quiet-thermal-step {
+	quiet-therm {
 		cooling-maps {
 			quiet_batt_cdev1 {
 				trip = <&quiet_batt_trip0>;
@@ -225,10 +225,17 @@
 				trip = <&quiet_batt_trip3>;
 				cooling-device = <&pm7250b_charger 16 16>;
 			};
+		};
+	};
 
-			quiet_batt_cdev5 {
-				trip = <&quiet_batt_trip4>;
-				cooling-device = <&pm7250b_charger 18 18>;
+	pm7250b-tz {
+		cooling-maps {
+			trip0_bat {
+				cooling-device = <&pm7250b_charger 15 15>;
+			};
+
+			trip1_bat {
+				cooling-device = <&pm7250b_charger 16 16>;
 			};
 		};
 	};
diff --git a/qcom/khaje-qrd.dtsi b/qcom/khaje-qrd.dtsi
index bd4063fe..74b0dba1 100644
--- a/qcom/khaje-qrd.dtsi
+++ b/qcom/khaje-qrd.dtsi
@@ -209,12 +209,10 @@
 };
 
 &thermal_zones {
-	quiet-thermal-step {
+	quiet-therm {
 		polling-delay-passive = <2000>;
 		polling-delay = <0>;
-		thermal-governor = "step_wise";
 		thermal-sensors = <&pm6125_adc_tm ADC5_AMUX_THM2_100K_PU>;
-		wake-capable-sensor;
 
 		trips {
 			quiet_batt_trip0: batt-trip0 {
@@ -288,19 +286,18 @@
 			gold_cdev {
 				trip = <&quiet_gold_trip>;
 				/* limit to 1766400khz */
-				cooling-device = <&CPU4 THERMAL_NO_LIMIT
-							(THERMAL_MAX_LIMIT-4)>;
+				cooling-device = <&CPU4 0 4>;
 			};
 
 			silver_cdev {
 				trip = <&quiet_silver_trip>;
 				/* limit to 1516800khz */
-				cooling-device = <&CPU0 THERMAL_NO_LIMIT
-							(THERMAL_MAX_LIMIT-4)>;
+				cooling-device = <&CPU0 0 2>;
 			};
 
 			gpu_cdev {
 				trip = <&quiet_gpu_trip>;
+				cooling-device = <&msm_gpu 0 3>;
 			};
 
 			hvx_cdev {
@@ -320,12 +317,10 @@
 		};
 	};
 
-	pa-therm0-step {
+	pa-therm0 {
 		polling-delay-passive = <0>;
 		polling-delay = <0>;
-		thermal-governor = "step_wise";
 		thermal-sensors = <&pm6125_adc_tm ADC5_AMUX_THM1_100K_PU>;
-		wake-capable-sensor;
 
 		trips {
 			pa_therm0_trip0: pa-therm0-trip0 {
diff --git a/qcom/khaje-thermal-pm7250b-overlay.dtsi b/qcom/khaje-thermal-pm7250b-overlay.dtsi
index 1c956548..5b65093b 100644
--- a/qcom/khaje-thermal-pm7250b-overlay.dtsi
+++ b/qcom/khaje-thermal-pm7250b-overlay.dtsi
@@ -6,13 +6,13 @@
 			trip0_bat {
 				trip = <&pm7250b_trip0>;
 				cooling-device =
-					<&pm7250b_charger 15 15>;
+					<&pm7250b_charger 9 9>;
 			};
 
 			trip1_bat {
 				trip = <&pm7250b_trip1>;
 				cooling-device =
-					<&pm7250b_charger 16 16>;
+					<&pm7250b_charger 10 10>;
 			};
 		};
 	};