Merge 91e6f8d6ec26032599d64a8848abeb83d3787db0 on remote branch
Change-Id: I871d808fd497256c13cbf54e30c960a8dfeeefcb
diff --git a/thermalConfig.cpp b/thermalConfig.cpp
index 04f43f2..03fd984 100644
--- a/thermalConfig.cpp
+++ b/thermalConfig.cpp
@@ -112,6 +112,114 @@
},
};
+ std::vector<std::string> cpu_sensors_monaco =
+ {
+ "cpuss-0-usr",
+ "cpuss-1-usr",
+ "cpuss-0-usr",
+ "cpuss-1-usr",
+ };
+
+ std::vector<struct target_therm_cfg> sensor_cfg_monaco =
+ {
+ {
+ TemperatureType::CPU,
+ cpu_sensors_monaco,
+ "",
+ 95000,
+ 115000,
+ 95000,
+ true,
+ },
+ {
+ TemperatureType::GPU,
+ { "gpu-usr" },
+ "gpu",
+ 95000,
+ 115000,
+ 95000,
+ true,
+ },
+ {
+ TemperatureType::SKIN,
+ { "quiet-therm-usr" },
+ "skin",
+ 40000,
+ 95000,
+ 40000,
+ true,
+ },
+ {
+ TemperatureType::BCL_CURRENT,
+ { "pm5100-ibat-lvl0" },
+ "ibat",
+ 1100,
+ 1500,
+ 1100,
+ true,
+ },
+ };
+
+ std::vector<std::string> cpu_sensors_sdm845 =
+ {
+ "cpu0-silver-usr",
+ "cpu1-silver-usr",
+ "cpu2-silver-usr",
+ "cpu3-silver-usr",
+ "cpu0-gold-usr",
+ "cpu1-gold-usr",
+ "cpu2-gold-usr",
+ "cpu3-gold-usr",
+ };
+
+ std::vector<struct target_therm_cfg> sensor_cfg_sdm845 = {
+ {
+ TemperatureType::CPU,
+ cpu_sensors_sdm845,
+ "",
+ 95000,
+ 115000,
+ 95000,
+ true,
+ },
+ {
+ TemperatureType::GPU,
+ {"gpu0-usr"},
+ "gpu0",
+ 95000,
+ 115000,
+ 95000,
+ true,
+ },
+ {
+ TemperatureType::GPU,
+ {"gpu1-usr"},
+ "gpu1",
+ 95000,
+ 115000,
+ 95000,
+ true,
+ },
+ {
+ TemperatureType::SKIN,
+ {"xo-therm-adc"},
+ "skin",
+ 40000,
+ 95000,
+ 40000,
+ true,
+ },
+ {
+ TemperatureType::BCL_PERCENTAGE,
+ {"soc"},
+ "soc",
+ 10,
+ 2,
+ 10,
+ false,
+ },
+ };
+
std::vector<std::string> cpu_sensors_bengal =
{
"cpuss-2-usr",
@@ -182,6 +290,64 @@
},
};
+ std::vector<struct target_therm_cfg> sensor_cfg_khaje =
+ {
+ {
+ TemperatureType::CPU,
+ cpu_sensors_bengal,
+ "",
+ 95000,
+ 115000,
+ 95000,
+ true,
+ },
+ {
+ TemperatureType::GPU,
+ { "gpu-usr" },
+ "GPU",
+ 95000,
+ 115000,
+ 95000,
+ true,
+ },
+ {
+ TemperatureType::SKIN,
+ { "xo-therm-usr" },
+ "skin",
+ 40000,
+ 95000,
+ 40000,
+ true,
+ },
+ {
+ TemperatureType::BCL_VOLTAGE,
+ { "pm7250b-vbat-lvl0" },
+ "vbat",
+ 3000,
+ 2800,
+ 3000,
+ false,
+ },
+ {
+ TemperatureType::BCL_CURRENT,
+ { "pm7250b-ibat-lvl0" },
+ "ibat",
+ 5500,
+ 6000,
+ 5500,
+ true,
+ },
+ {
+ TemperatureType::BCL_PERCENTAGE,
+ { "soc" },
+ "soc",
+ 10,
+ 2,
+ 10,
+ false,
+ },
+ };
+
std::vector<std::string> cpu_sensors_trinket =
{
"cpuss-0-usr",
@@ -783,12 +949,15 @@
{364, sensor_cfg_439},
{416, sensor_cfg_439},
{437, sensor_cfg_439},
+ {321, sensor_cfg_sdm845},
+ {341, sensor_cfg_sdm845},
{417, sensor_cfg_bengal}, // bengal
{420, sensor_cfg_bengal},
{444, sensor_cfg_bengal},
{445, sensor_cfg_bengal},
{469, sensor_cfg_bengal},
{470, sensor_cfg_bengal},
+ {518, sensor_cfg_khaje}, //khaje
{394, sensor_cfg_trinket},
{467, sensor_cfg_trinket},
{468, sensor_cfg_trinket},
@@ -813,8 +982,10 @@
{502, lahaina_common},
{450, lahaina_common}, // shima
{454, sensor_cfg_holi}, // holi
+ {507, sensor_cfg_holi}, // blair
{475, sensor_cfg_yupik}, // yupik
{515, sensor_cfg_yupik}, // YUPIK-LTE
+ {486, sensor_cfg_monaco}, // monaco
};
const std::unordered_map<int, std::vector<struct target_therm_cfg>>