diff options
author | Alex Hong <rurumihong@google.com> | 2020-02-26 01:49:39 +0800 |
---|---|---|
committer | Alex Hong <rurumihong@google.com> | 2020-02-26 01:50:21 +0800 |
commit | 30ce54b7b03d98f48f4ca38e87068f939844f9db (patch) | |
tree | e44ef7ce8091922eeecdcfe001df8f9712d840c4 | |
parent | 178c0f6ce3cd0461f69dd6451380f19d18e09c0e (diff) | |
parent | f9dc8afcdf4c17305157de464b5c51967268f2c5 (diff) | |
download | thermal-android-mainline-11.0.0_r18.tar.gz |
Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.8.9.C2.08.00.00.618.012' into rvc-devandroid-mainline-12.0.0_r112android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseandroid11-mainline-tethering-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devaml_tz2_305400100
Bug: 149539244
Change-Id: Id7135efe7c3b91284056270f6c119747d2b3435b
-rw-r--r-- | thermal_common.h | 4 | ||||
-rw-r--r-- | thermal_target.c | 47 |
2 files changed, 49 insertions, 2 deletions
diff --git a/thermal_common.h b/thermal_common.h index 76bcff6..8e55868 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,8 @@ enum therm_msm_id { THERM_MSM_8917, THERM_TRINKET, THERM_KONA, + THERM_LITO, + THERM_ATOLL, }; struct target_therm_cfg { diff --git a/thermal_target.c b/thermal_target.c index 7298f59..4332554 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 @@ -67,6 +67,7 @@ static struct therm_msm_soc_type msm_soc_table[] = { {THERM_SDM_439, 363}, {THERM_SDM_439, 364}, {THERM_MSMNILE, 339}, + {THERM_MSMNILE, 361}, {THERM_MSMNILE, 362}, {THERM_MSMNILE, 367}, {THERM_KONA, 356}, @@ -78,6 +79,8 @@ 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}, + {THERM_ATOLL, 407}, }; static char *cpu_sensors_talos[] = @@ -178,6 +181,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 +745,11 @@ 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: + case THERM_ATOLL: + cfg = sensor_cfg_lito; + num_cfg = ARRAY_SIZE(sensor_cfg_lito); + break; default: cfg = NULL; num_cfg = 0; |