Merge c47c922ad9367be688982f97077424319f17282f on remote branch
Change-Id: I06f5d6e39a93ac7d28d59130f405358dafd48958
diff --git a/thermalConfig.cpp b/thermalConfig.cpp
index 0b1830b..1d5f23c 100644
--- a/thermalConfig.cpp
+++ b/thermalConfig.cpp
@@ -48,14 +48,14 @@
std::vector<std::string> cpu_sensors_bengal =
{
- "cpuss-2-usr",
- "cpuss-2-usr",
- "cpuss-2-usr",
- "cpuss-2-usr",
- "cpu-1-0-usr",
- "cpu-1-1-usr",
- "cpu-1-2-usr",
- "cpu-1-3-usr",
+ "cpuss-0",
+ "cpuss-1",
+ "cpuss-2",
+ "cpuss-2",
+ "cpu-1-0",
+ "cpu-1-1",
+ "cpu-1-2",
+ "cpu-1-3",
};
std::vector<struct target_therm_cfg> sensor_cfg_bengal =
@@ -71,7 +71,7 @@
},
{
TemperatureType::GPU,
- { "gpu-usr" },
+ { "gpu" },
"GPU",
95000,
115000,
@@ -80,7 +80,7 @@
},
{
TemperatureType::SKIN,
- { "xo-therm-usr" },
+ { "xo-therm" },
"skin",
40000,
95000,
@@ -88,15 +88,6 @@
true,
},
{
- TemperatureType::BCL_VOLTAGE,
- { "pmi632-vbat-lvl0" },
- "vbat",
- 3000,
- 2800,
- 3000,
- false,
- },
- {
TemperatureType::BCL_CURRENT,
{ "pmi632-ibat-lvl0" },
"ibat",
@@ -107,11 +98,11 @@
},
{
TemperatureType::BCL_PERCENTAGE,
- { "soc" },
- "soc",
- 10,
- 2,
- 10,
+ { "socd" },
+ "socd",
+ 90,
+ 99,
+ 90,
false,
},
};