diff --git a/arch/arm/configs/vendor/sdxlemur-debug.config b/arch/arm/configs/vendor/sdxlemur-debug.config
index e2b0870a128e..497959020c2d 100644
--- a/arch/arm/configs/vendor/sdxlemur-debug.config
+++ b/arch/arm/configs/vendor/sdxlemur-debug.config
@@ -34,7 +34,6 @@ CONFIG_QCOM_RTB_QGKI=y
 CONFIG_REGULATOR_QTI_DEBUG=y
 CONFIG_REGMAP_ALLOW_WRITE_DEBUGFS=y
 CONFIG_SPMI_MSM_PMIC_ARB_DEBUG=y
-CONFIG_THERMAL_WRITABLE_TRIPS=y
 CONFIG_MMC_IPC_LOGGING=y
 CONFIG_BUG_ON_DATA_CORRUPTION=y
 CONFIG_DEBUG_CREDENTIALS=y
diff --git a/arch/arm/configs/vendor/sdxlemur.config b/arch/arm/configs/vendor/sdxlemur.config
index ec98453ae81b..6cfc4840288e 100644
--- a/arch/arm/configs/vendor/sdxlemur.config
+++ b/arch/arm/configs/vendor/sdxlemur.config
@@ -329,6 +329,12 @@ CONFIG_MMC_SDHCI_MSM=y
 CONFIG_ARM_MEMLAT_MON=y
 CONFIG_DEVFREQ_GOV_MEMLAT=y
 CONFIG_QCOM_DEVFREQ_ICC=y
+CONFIG_THERMAL=y
+CONFIG_THERMAL_WRITABLE_TRIPS=y
+CONFIG_THERMAL_GOV_USER_SPACE=y
+CONFIG_CPU_THERMAL=y
+CONFIG_QTI_QMI_COOLING_DEVICE=y
+CONFIG_QTI_QMI_SENSOR=y
 CONFIG_THERMAL_TSENS=y
 CONFIG_SERIAL_MSM=y
 CONFIG_QCOM_EUD=y
diff --git a/drivers/thermal/qcom/qmi_sensors.c b/drivers/thermal/qcom/qmi_sensors.c
index ff9763af1f0d..3ce73776ee38 100644
--- a/drivers/thermal/qcom/qmi_sensors.c
+++ b/drivers/thermal/qcom/qmi_sensors.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2018-2021, The Linux Foundation. All rights reserved.
  */
 
 #define pr_fmt(fmt) "%s:%s " fmt, KBUILD_MODNAME, __func__
@@ -70,6 +70,27 @@ enum qmi_ts_sensor {
 	QMI_TS_QFE_WTR_PA2_FR1,
 	QMI_TS_QFE_WTR_PA3_FR1,
 	QMI_TS_QFE_WTR0_FR1,
+	QMI_TS_QTM_THERM,
+	QMI_TS_BCL_WARN,
+	QMI_TS_SDR0_PA0,
+	QMI_TS_SDR0_PA1,
+	QMI_TS_SDR0_PA2,
+	QMI_TS_SDR0_PA3,
+	QMI_TS_SDR0_PA4,
+	QMI_TS_SDR0_PA5,
+	QMI_TS_SDR0,
+	QMI_TS_SDR1_PA0,
+	QMI_TS_SDR1_PA1,
+	QMI_TS_SDR1_PA2,
+	QMI_TS_SDR1_PA3,
+	QMI_TS_SDR1_PA4,
+	QMI_TS_SDR1_PA5,
+	QMI_TS_SDR1,
+	QMI_TS_MMW0,
+	QMI_TS_MMW1,
+	QMI_TS_MMW2,
+	QMI_TS_MMW3,
+	QMI_TS_MMW_IFIC0,
 	QMI_TS_MAX_NR
 };
 
@@ -141,6 +162,27 @@ static char sensor_clients[QMI_TS_MAX_NR][QMI_CLIENT_NAME_LENGTH] = {
 	{"qfe_wtr_pa2_fr1"},
 	{"qfe_wtr_pa3_fr1"},
 	{"qfe_wtr0_fr1"},
+	{"qtm_therm"},
+	{"modem_bcl_warn"},
+	{"sdr0_pa0"},
+	{"sdr0_pa1"},
+	{"sdr0_pa2"},
+	{"sdr0_pa3"},
+	{"sdr0_pa4"},
+	{"sdr0_pa5"},
+	{"sdr0"},
+	{"sdr1_pa0"},
+	{"sdr1_pa1"},
+	{"sdr1_pa2"},
+	{"sdr1_pa3"},
+	{"sdr1_pa4"},
+	{"sdr1_pa5"},
+	{"sdr1"},
+	{"mmw0"},
+	{"mmw1"},
+	{"mmw2"},
+	{"mmw3"},
+	{"mmw_ific0"},
 };
 
 static int32_t encode_qmi(int32_t val)
@@ -463,7 +505,7 @@ static int verify_sensor_and_register(struct qmi_ts_instance *ts)
 
 	for (i = 0; i < ts_resp->sensor_list_len; i++) {
 		struct qmi_sensor *qmi_sens = NULL;
-
+		pr_debug("QMI sensor:%s\n", ts_resp->sensor_list[i].sensor_id);
 		list_for_each_entry(qmi_sens, &ts->ts_sensor_list,
 					ts_node) {
 			if ((strncasecmp(qmi_sens->qmi_name,