Merge "thermal-hal: update cpu, vbat and socd sensor configurations for khaje"
diff --git a/thermalCommon.cpp b/thermalCommon.cpp
index 02c14e1..3f0c997 100644
--- a/thermalCommon.cpp
+++ b/thermalCommon.cpp
@@ -107,6 +107,7 @@
{"cdsp", cdevType::NPU},
{"cdsp_hw", cdevType::NPU},
{"battery", cdevType::BATTERY},
+ {"fan-max31760", cdevType::FAN},
};
ThermalCommon::ThermalCommon()
diff --git a/thermalConfig.cpp b/thermalConfig.cpp
index 790ec03..bc114a8 100644
--- a/thermalConfig.cpp
+++ b/thermalConfig.cpp
@@ -435,14 +435,14 @@
std::vector<std::string> cpu_sensors_kona =
{
- "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",
+ "cpu-0-0",
+ "cpu-0-1",
+ "cpu-0-2",
+ "cpu-0-3",
+ "cpu-1-0",
+ "cpu-1-1",
+ "cpu-1-2",
+ "cpu-1-3",
};
std::vector<struct target_therm_cfg> sensor_cfg_msmnile = {
@@ -523,7 +523,7 @@
},
{
TemperatureType::GPU,
- { "gpuss-0-usr" },
+ { "gpuss-0" },
"GPU0",
95000,
115000,
@@ -532,7 +532,7 @@
},
{
TemperatureType::GPU,
- { "gpuss-1-usr" },
+ { "gpuss-1" },
"GPU1",
95000,
115000,
@@ -541,7 +541,7 @@
},
{
TemperatureType::SKIN,
- { "skin-msm-therm-usr" },
+ { "skin-msm-therm" },
"skin",
40000,
95000,
@@ -562,7 +562,7 @@
},
{
TemperatureType::BCL_VOLTAGE,
- { "pm8150b-vbat-lvl0" },
+ { "vbat" },
"vbat",
3200,
3000,
@@ -571,16 +571,16 @@
},
{
TemperatureType::BCL_PERCENTAGE,
- { "soc" },
- "soc",
- 10,
- 2,
- 10,
+ { "socd" },
+ "socd",
+ 90,
+ 99,
+ 90,
false,
},
{
TemperatureType::NPU,
- { "npu-usr" },
+ { "npu" },
"npu",
95000,
115000,
@@ -1094,6 +1094,8 @@
{536, kalama_common}, //Kalamap
{600, kalama_common}, //Kalama_sg
{601, kalama_common}, //Kalamap_sg
+ {603, kalama_common}, //Kalama_qcs
+ {604, kalama_common}, //Kalama_qcm
};
const std::unordered_map<int, std::vector<struct target_therm_cfg>>
@@ -1116,6 +1118,8 @@
{536, kalama_specific}, //Kalamap
{600, kalama_specific}, //Kalama_sg
{601, kalama_specific}, //Kalamap_sg
+ {603, kalama_specific}, //Kalama_qcs
+ {604, kalama_specific}, //Kalama_qcm
};
std::vector<struct target_therm_cfg> add_target_config(