ARM: dts: msm: Add modem sensors for kona

Add all the modem sensors to thermal framework so that it can be
monitored and mitigated for thermal conditions in kona.

Change-Id: If3b6a00b54d791c870cb4eb1be1c8bf161db7429

1 files changed, 206 insertions, 12 deletions

diff --git a/qcom/kona-thermal.dtsi b/qcom/kona-thermal.dtsi
index 32448422..25bf4bdc 100644
--- a/qcom/kona-thermal.dtsi
+++ b/qcom/kona-thermal.dtsi
@@ -1,4 +1,5 @@
 #include <dt-bindings/thermal/thermal.h>
+#include <dt-bindings/thermal/qmi_thermal.h>
 
 &cpufreq_hw {
 	qcom,cpu-isolation {
@@ -124,11 +125,9 @@
 		#thermal-sensor-cells = <1>;
 
 		modem {
-			qcom,instance-id = <100>;
+			qcom,instance-id = <QMI_MODEM_NR_INST_ID>;
 			qcom,qmi-sensor-names = "pa",
 						"pa_1",
-						"pa_2",
-						"qfe_pa0",
 						"qfe_wtr0",
 						"modem_tsens",
 						"qfe_mmw0",
@@ -136,8 +135,19 @@
 						"qfe_mmw2",
 						"qfe_mmw3",
 						"xo_therm",
-						"qfe_pa_mdm",
-						"qfe_pa_wtr";
+						"qfe_mmw_streamer0",
+						"qfe_mmw0_mod",
+						"qfe_mmw1_mod",
+						"qfe_mmw2_mod",
+						"qfe_mmw3_mod",
+						"qfe_ret_pa0",
+						"qfe_wtr_pa0",
+						"qfe_wtr_pa1",
+						"qfe_wtr_pa2",
+						"qfe_wtr_pa3",
+						"sys_therm1",
+						"sys_therm2",
+						"modem_tsens1";
 		};
 	};
 };
@@ -947,11 +957,12 @@
 		};
 	};
 
-	modem-pa0-usr {
+	modem-lte-sub6-pa1 {
 		polling-delay-passive = <0>;
 		polling-delay = <0>;
 		thermal-governor = "user_space";
-		thermal-sensors = <&qmi_sensor 100>;
+		thermal-sensors = <&qmi_sensor
+				(QMI_MODEM_NR_INST_ID+QMI_PA)>;
 		trips {
 			active-config0 {
 				temperature = <125000>;
@@ -961,11 +972,12 @@
 		};
 	};
 
-	modem-pa1-usr {
+	modem-lte-sub6-pa2 {
 		polling-delay-passive = <0>;
 		polling-delay = <0>;
 		thermal-governor = "user_space";
-		thermal-sensors = <&qmi_sensor 101>;
+		thermal-sensors = <&qmi_sensor
+				(QMI_MODEM_NR_INST_ID+QMI_PA_1)>;
 		trips {
 			active-config0 {
 				temperature = <125000>;
@@ -975,11 +987,57 @@
 		};
 	};
 
-	modem-modem-usr {
+	modem-mmw0-usr {
 		polling-delay-passive = <0>;
 		polling-delay = <0>;
 		thermal-governor = "user_space";
-		thermal-sensors = <&qmi_sensor 105>;
+		thermal-sensors = <&qmi_sensor
+				(QMI_MODEM_NR_INST_ID+QMI_QFE_MMW_0)>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+		};
+	};
+
+	modem-mmw1-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&qmi_sensor
+				(QMI_MODEM_NR_INST_ID+QMI_QFE_MMW_1)>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+		};
+	};
+
+	modem-mmw2-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&qmi_sensor
+				(QMI_MODEM_NR_INST_ID+QMI_QFE_MMW_2)>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+		};
+	};
+
+	modem-mmw3-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&qmi_sensor
+				(QMI_MODEM_NR_INST_ID+QMI_QFE_MMW_3)>;
 		trips {
 			active-config0 {
 				temperature = <125000>;
@@ -993,7 +1051,143 @@
 		polling-delay-passive = <0>;
 		polling-delay = <0>;
 		thermal-governor = "user_space";
-		thermal-sensors = <&qmi_sensor 110>;
+		thermal-sensors = <&qmi_sensor
+				(QMI_MODEM_NR_INST_ID+QMI_XO_THERM)>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+		};
+	};
+
+	modem-wifi-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&qmi_sensor
+				(QMI_MODEM_NR_INST_ID+QMI_SYS_THERM_1)>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+		};
+	};
+
+	modem-ambient-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&qmi_sensor
+				(QMI_MODEM_NR_INST_ID+QMI_SYS_THERM_2)>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+		};
+	};
+
+	modem-0-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&qmi_sensor
+				(QMI_MODEM_NR_INST_ID+QMI_MODEM_TSENS)>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+		};
+	};
+
+	modem-1-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&qmi_sensor
+				(QMI_MODEM_NR_INST_ID+QMI_MODEM_TSENS_1)>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+		};
+	};
+
+	modem-streamer-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&qmi_sensor
+				(QMI_MODEM_NR_INST_ID+QMI_QFE_MMW_STREAMER_0)>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+		};
+	};
+
+	modem-mmw0-mod-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&qmi_sensor
+				(QMI_MODEM_NR_INST_ID+QMI_QFE_MMW_0_MOD)>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+		};
+	};
+
+	modem-mmw1-mod-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&qmi_sensor
+				(QMI_MODEM_NR_INST_ID+QMI_QFE_MMW_1_MOD)>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+		};
+	};
+
+	modem-mmw2-mod-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&qmi_sensor
+				(QMI_MODEM_NR_INST_ID+QMI_QFE_MMW_2_MOD)>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+		};
+	};
+
+	modem-mmw3-mod-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&qmi_sensor
+				(QMI_MODEM_NR_INST_ID+QMI_QFE_MMW_3_MOD)>;
 		trips {
 			active-config0 {
 				temperature = <125000>;