Merge "ARM: dts: qcom: enable NSP isense trim thermal zone and mitigation"

bindings/thermal/qti-qmi-sensor.txt

@@ -82,6 +82,19 @@ Subsystem properties:
 		49. mmw2
 		50. mmw3
 		51. mmw_ific0
+		52. sub1_modem_cfg
+		53. sub1_lte_cc
+		54. sub1_mcg_fr1_cc
+		55. sub1_mcg_fr2_cc
+		56. sub1_scg_fr1_cc
+		57. sub1_scg_fr2_cc
+		58. sub2_modem_cfg
+		59. sub2_lte_cc
+		60. sub2_mcg_fr1_cc
+		61. sub2_mcg_fr2_cc
+		62. sub2_scg_fr1_cc
+		63. sub2_scg_fr2_cc
+		64. isense_trim
 
 Example:
 
@@ -96,4 +109,9 @@ qmi_sensor: qmi-ts-sensors {
 					"qfe_pa0",
 					"qfe_wtr0";
 	};
+
+	cdsp {
+		qcom,instance-id = <QMI_CDSP_INST_ID>;
+		qcom,qmi-sensor-names = "isense_trim";
+	};
 };

qcom/waipio-thermal.dtsi

@@ -247,6 +247,15 @@
 
 #include "waipio-thermal-modem.dtsi"
 
+&soc {
+	qmi-ts-sensors {
+		cdsp {
+			qcom,instance-id = <QMI_CDSP_INST_ID>;
+			qcom,qmi-sensor-names = "isense_trim";
+		};
+	};
+};
+
 &thermal_zones {
 	aoss-0 {
 		polling-delay-passive = <0>;
@@ -1484,4 +1493,35 @@
 			};
 		};
 	};
+
+	isense_trim {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-sensors = <&qmi_sensor
+				(QMI_CDSP_INST_ID+QMI_NSP_ISENSE_TRIM)>;
+		trips {
+			isense_trim_trip: isense-trim-config {
+				temperature = <2>;
+				hysteresis = <1>;
+				type = "passive";
+			};
+		};
+
+		cooling-maps {
+			gold_cdev {
+				trip = <&isense_trim_trip>;
+				cooling-device = <&CPU4 15 15>;
+			};
+
+			gold_plus_cdev {
+				trip = <&isense_trim_trip>;
+				cooling-device = <&CPU7 15 15>;
+			};
+
+			cdsp_hw_cdev {
+				trip = <&isense_trim_trip>;
+				cooling-device = <&cdsp_hw 1 1>;
+			};
+		};
+	};
 };

qcom/waipio-v2.dtsi

@@ -161,4 +161,15 @@
 		};
 	};
 };
+
+&thermal_zones {
+	isense_trim {
+		cooling-maps {
+			gold_plus_cdev {
+				cooling-device = <&CPU7 18 18>;
+			};
+		};
+	};
+};
+
 #include "waipio-v2-gpu.dtsi"