Merge remote-tracking branch 'goog/qcom/release/LA.UM.8.1.C9.09.00.00.518.048'

Bug: 123862805
Change-Id: I997ad01c775b290da51ca80eeda40de61d52c82e

2 files changed, 58 insertions, 0 deletions

diff --git a/thermal_common.h b/thermal_common.h
index c76952e..76bcff6 100644
--- a/thermal_common.h
+++ b/thermal_common.h
@@ -42,6 +42,8 @@ enum therm_msm_id {
     THERM_TALOS,
     THERM_SDMMAGPIE,
     THERM_MSM_8917,
+    THERM_TRINKET,
+    THERM_KONA,
 };
 
 struct target_therm_cfg {
diff --git a/thermal_target.c b/thermal_target.c
index 96d4921..88d0b30 100644
--- a/thermal_target.c
+++ b/thermal_target.c
@@ -69,6 +69,7 @@ static struct therm_msm_soc_type msm_soc_table[] = {
     {THERM_MSMNILE, 339},
     {THERM_MSMNILE, 362},
     {THERM_MSMNILE, 367},
+    {THERM_KONA, 356},
     {THERM_TALOS,  355},
     {THERM_SDMMAGPIE, 365},
     {THERM_MSM_8917, 303},
@@ -76,6 +77,7 @@ static struct therm_msm_soc_type msm_soc_table[] = {
     {THERM_MSM_8917, 308},
     {THERM_MSM_8917, 309},
     {THERM_MSM_8917, 386}, // This SOC ID is for QM215
+    {THERM_TRINKET,  394},
 };
 
 static char *cpu_sensors_talos[] =
@@ -176,6 +178,55 @@ static struct target_therm_cfg sensor_cfg_sdmmagpie[] = {
     }
 };
 
+static char *cpu_sensors_trinket[] =
+{
+    "cpu-0-0-usr",
+    "cpu-0-1-usr",
+    "cpu-0-2-usr",
+    "cpu-0-3-usr",
+    "cpu-1-0-usr",
+    "cpu-1-1-usr",
+    "cpu-1-2-usr",
+    "cpu-1-3-usr",
+};
+
+static char *misc_sensors_trinket[] =
+{
+    "gpu-usr",
+    "battery",
+    "xo-therm-adc"
+};
+
+static struct target_therm_cfg sensor_cfg_trinket[] = {
+    {
+        .type = DEVICE_TEMPERATURE_CPU,
+        .sensor_list = cpu_sensors_trinket,
+        .sens_cnt = ARRAY_SIZE(cpu_sensors_trinket),
+        .mult = 0.001,
+    },
+    {
+        .type = DEVICE_TEMPERATURE_GPU,
+        .sensor_list = &misc_sensors_trinket[0],
+        .sens_cnt = 1,
+        .mult = 0.001,
+        .label = "GPU",
+    },
+    {
+        .type = DEVICE_TEMPERATURE_BATTERY,
+        .sensor_list = &misc_sensors_trinket[1],
+        .sens_cnt = 1,
+        .mult = 0.001,
+        .label = "battery",
+    },
+    {
+        .type = DEVICE_TEMPERATURE_SKIN,
+        .sensor_list = &misc_sensors_trinket[2],
+        .sens_cnt = 1,
+        .mult = 0.001,
+        .label = "skin",
+    }
+};
+
 static char *cpu_sensors_msmnile[] =
 {
     "cpu-0-0-usr",
@@ -638,6 +689,7 @@ ssize_t get_temperatures(thermal_module_t *module, temperature_t *list, size_t s
                 num_cfg = ARRAY_SIZE(sensor_cfg_8917);
                 break;
             case THERM_MSMNILE:
+            case THERM_KONA:
                 cfg = sensor_cfg_msmnile;
                 num_cfg = ARRAY_SIZE(sensor_cfg_msmnile);
                 break;
@@ -649,6 +701,10 @@ ssize_t get_temperatures(thermal_module_t *module, temperature_t *list, size_t s
                 cfg = sensor_cfg_sdmmagpie;
                 num_cfg = ARRAY_SIZE(sensor_cfg_sdmmagpie);
                 break;
+            case THERM_TRINKET:
+                cfg = sensor_cfg_trinket;
+                num_cfg = ARRAY_SIZE(sensor_cfg_trinket);
+                break;
             default:
                 cfg = NULL;
                 num_cfg = 0;