Merge "drivers: thermal: qmi_sensor: Add support for new sensors"

drivers/thermal/qcom/qmi_sensors.c

@@ -43,6 +43,19 @@ enum qmi_ts_sensor {
 	QMI_TS_MODEM_SKIN,
 	QMI_TS_QFE_PA_MDM,
 	QMI_TS_QFE_PA_WTR,
+	QMI_TS_STREAMER_0,
+	QMI_TS_MOD_MMW_0,
+	QMI_TS_MOD_MMW_1,
+	QMI_TS_MOD_MMW_2,
+	QMI_TS_MOD_MMW_3,
+	QMI_TS_RET_PA_0,
+	QMI_TS_WTR_PA_0,
+	QMI_TS_WTR_PA_1,
+	QMI_TS_WTR_PA_2,
+	QMI_TS_WTR_PA_3,
+	QMI_SYS_THERM1,
+	QMI_SYS_THERM2,
+	QMI_TS_TSENS_1,
 	QMI_TS_MAX_NR
 };
 
@@ -87,6 +100,19 @@ static char sensor_clients[QMI_TS_MAX_NR][QMI_CLIENT_NAME_LENGTH] = {
 	{"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"},
 };
 
 static int32_t encode_qmi(int32_t val)

include/dt-bindings/thermal/qmi_thermal.h

@@ -0,0 +1,40 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved. */
+
+#ifndef _DT_BINDINGS_QCOM_QMI_THERMAL_H
+#define _DT_BINDINGS_QCOM_QMI_THERMAL_H
+
+#define QMI_PA			0
+#define QMI_PA_1		1
+#define QMI_PA_2		2
+#define QMI_QFE_PA_0		3
+#define QMI_QFE_WTR_0		4
+#define QMI_MODEM_TSENS		5
+#define QMI_QFE_MMW_0		6
+#define QMI_QFE_MMW_1		7
+#define QMI_QFE_MMW_2		8
+#define QMI_QFE_MMW_3		9
+#define QMI_XO_THERM		10
+#define QMI_QFE_PA_MDM		11
+#define QMI_QFE_PA_WTR		12
+#define QMI_QFE_MMW_STREAMER_0	13
+#define QMI_QFE_MMW_0_MOD	14
+#define QMI_QFE_MMW_1_MOD	15
+#define QMI_QFE_MMW_2_MOD	16
+#define QMI_QFE_MMW_3_MOD	17
+#define QMI_QFE_RET_PA_0	18
+#define QMI_QFE_WTR_PA_0	19
+#define QMI_QFE_WTR_PA_1	20
+#define QMI_QFE_WTR_PA_2	21
+#define QMI_QFE_WTR_PA_3	22
+#define QMI_SYS_THERM_1		23
+#define QMI_SYS_THERM_2		24
+#define QMI_MODEM_TSENS_1	25
+
+#define QMI_MODEM_INST_ID	0x0
+#define QMI_ADSP_INST_ID	0x1
+#define QMI_CDSP_INST_ID	0x43
+#define QMI_SLPI_INST_ID	0x53
+#define QMI_MODEM_NR_INST_ID	0x64
+
+#endif