Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.8.9.08.00.00.478.122' into pi-devandroid-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42pie-qpr3-releasepie-qpr3-b-releasepie-b4s4-dev

Bug: 119743470
Change-Id: Ie71e52d0506fe1010452ae0cc2f47b84cf434188

2 files changed, 57 insertions, 0 deletions

diff --git a/thermal_common.h b/thermal_common.h
index d67661a..8ffbc5c 100644
--- a/thermal_common.h
+++ b/thermal_common.h
@@ -39,6 +39,7 @@ enum therm_msm_id {
     THERM_SDM_632,
     THERM_SDM_439,
     THERM_MSMNILE,
+    THERM_TALOS,
 };
 
 struct target_therm_cfg {
diff --git a/thermal_target.c b/thermal_target.c
index cce237e..bf3f0a5 100644
--- a/thermal_target.c
+++ b/thermal_target.c
@@ -58,6 +58,7 @@ static struct therm_msm_soc_type msm_soc_table[] = {
     {THERM_SDM_630, 385},
     {THERM_SDM_710, 336},
     {THERM_SDM_710, 337},
+    {THERM_SDM_710, 393}, // This SOC ID is for SDM712
     {THERM_QCS_605, 347},
     {THERM_SDM_632, 349},
     {THERM_SDM_632, 350},
@@ -68,8 +69,59 @@ static struct therm_msm_soc_type msm_soc_table[] = {
     {THERM_MSMNILE, 339},
     {THERM_MSMNILE, 362},
     {THERM_MSMNILE, 367},
+    {THERM_TALOS,  355},
 };
 
+static char *cpu_sensors_talos[] =
+{
+    "cpuss-2-usr",
+    "cpuss-2-usr",
+    "cpuss-1-usr",
+    "cpuss-1-usr",
+    "cpuss-0-usr",
+    "cpuss-0-usr",
+    "cpu-1-0-usr",
+    "cpu-1-2-usr",
+};
+
+static char *misc_sensors_talos[] =
+{
+    "gpu-usr",
+    "battery",
+    "xo-therm"
+};
+
+static struct target_therm_cfg sensor_cfg_talos[] = {
+    {
+        .type = DEVICE_TEMPERATURE_CPU,
+        .sensor_list = cpu_sensors_talos,
+        .sens_cnt = ARRAY_SIZE(cpu_sensors_talos),
+        .mult = 0.001,
+    },
+    {
+        .type = DEVICE_TEMPERATURE_GPU,
+        .sensor_list = &misc_sensors_talos[0],
+        .sens_cnt = 1,
+        .mult = 0.001,
+        .label = "GPU",
+    },
+    {
+        .type = DEVICE_TEMPERATURE_BATTERY,
+        .sensor_list = &misc_sensors_talos[1],
+        .sens_cnt = 1,
+        .mult = 0.001,
+        .label = "battery",
+    },
+    {
+        .type = DEVICE_TEMPERATURE_SKIN,
+        .sensor_list = &misc_sensors_talos[2],
+        .sens_cnt = 1,
+        .mult = 0.001,
+        .label = "skin",
+    }
+};
+
+
 static char *cpu_sensors_msmnile[] =
 {
     "cpu-0-0-usr",
@@ -486,6 +538,10 @@ ssize_t get_temperatures(thermal_module_t *module, temperature_t *list, size_t s
                 cfg = sensor_cfg_msmnile;
                 num_cfg = ARRAY_SIZE(sensor_cfg_msmnile);
                 break;
+            case THERM_TALOS:
+                cfg = sensor_cfg_talos;
+                num_cfg = ARRAY_SIZE(sensor_cfg_talos);
+                break;
             default:
                 cfg = NULL;
                 num_cfg = 0;