diff options
author | Cyan_Hsieh <cyanhsieh@google.com> | 2019-06-01 03:01:00 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-01 03:01:00 -0700 |
commit | 4c0a7b41788966b849d84021e1cf20eac72c1177 (patch) | |
tree | e10fe91fc9e0f6b6fb46e2f49087d211e03feccc | |
parent | e4d3100e398a1782eb567933f87bb30422fb001d (diff) | |
parent | e7a6c4edfa7b2cdd492804628b39f3db30b1d346 (diff) | |
download | thermal-4c0a7b41788966b849d84021e1cf20eac72c1177.tar.gz |
Merge remote-tracking branch 'goog/qcom/release/LA.UM.8.1.C9.09.00.00.518.158' into qt-r1-dev
am: e7a6c4edfa
Change-Id: I0cc50ebd44cc566fd6db1ddeba3ecd9b3682d62b
-rw-r--r-- | thermal_common.h | 3 | ||||
-rw-r--r-- | thermal_target.c | 44 |
2 files changed, 45 insertions, 2 deletions
diff --git a/thermal_common.h b/thermal_common.h index 76bcff6..0d00d5b 100644 --- a/thermal_common.h +++ b/thermal_common.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, The Linux Foundation. All rights reserved. +/* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are @@ -44,6 +44,7 @@ enum therm_msm_id { THERM_MSM_8917, THERM_TRINKET, THERM_KONA, + THERM_LITO, }; struct target_therm_cfg { diff --git a/thermal_target.c b/thermal_target.c index 7298f59..7d3efc2 100644 --- a/thermal_target.c +++ b/thermal_target.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, The Linux Foundation. All rights reserved. +/* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are @@ -78,6 +78,7 @@ static struct therm_msm_soc_type msm_soc_table[] = { {THERM_MSM_8917, 309}, {THERM_MSM_8917, 386}, // This SOC ID is for QM215 {THERM_TRINKET, 394}, + {THERM_LITO, 400}, }; static char *cpu_sensors_talos[] = @@ -178,6 +179,43 @@ static struct target_therm_cfg sensor_cfg_sdmmagpie[] = { } }; +static char *misc_sensors_lito[] = +{ + "gpuss-0-usr", + "battery", + "xo-therm-usr" +}; + +static struct target_therm_cfg sensor_cfg_lito[] = { + { + .type = DEVICE_TEMPERATURE_CPU, + .sensor_list = cpu_sensors_sdmmagpie, + .sens_cnt = ARRAY_SIZE(cpu_sensors_sdmmagpie), + .mult = 0.001, + }, + { + .type = DEVICE_TEMPERATURE_GPU, + .sensor_list = &misc_sensors_lito[0], + .sens_cnt = 1, + .mult = 0.001, + .label = "GPU", + }, + { + .type = DEVICE_TEMPERATURE_BATTERY, + .sensor_list = &misc_sensors_lito[1], + .sens_cnt = 1, + .mult = 0.001, + .label = "battery", + }, + { + .type = DEVICE_TEMPERATURE_SKIN, + .sensor_list = &misc_sensors_lito[2], + .sens_cnt = 1, + .mult = 0.001, + .label = "skin", + } +}; + static char *cpu_sensors_trinket[] = { "cpuss-0-usr", @@ -705,6 +743,10 @@ ssize_t get_temperatures(thermal_module_t *module, temperature_t *list, size_t s cfg = sensor_cfg_trinket; num_cfg = ARRAY_SIZE(sensor_cfg_trinket); break; + case THERM_LITO: + cfg = sensor_cfg_lito; + num_cfg = ARRAY_SIZE(sensor_cfg_lito); + break; default: cfg = NULL; num_cfg = 0; |