diff options
author | Xin Li <delphij@google.com> | 2020-09-08 16:55:39 -0700 |
---|---|---|
committer | Xin Li <delphij@google.com> | 2020-09-08 16:55:39 -0700 |
commit | 8a482bd1c4fd932cbeedbe094666769317ac3d7c (patch) | |
tree | 44d33dc292fe604c7b379e0d7a98394de82e5cbf | |
parent | 069704a519fa98f9f1be9736bce8d528bf72e7ff (diff) | |
parent | c989a84ff6f4c19dfb1506106966bb6d2034a2e0 (diff) | |
download | thermal-8a482bd1c4fd932cbeedbe094666769317ac3d7c.tar.gz |
Merge Android R
Bug: 168057903
Merged-In: Id718c5b4b6d4be4b00d7774f5e6a86c74c05b684
Change-Id: Icfaa3f24a7210e1fb1e8305bbbdbb1dd0064bb9d
-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; |