Merge tag 'LA.VENDOR.13.2.0.r1-15000-KAILUA.0' of https://git.codelinaro.org/clo/la/platform/hardware/qcom/thermal into topaz

LA.VENDOR.13.2.0.r1-15000-KAILUA.0

* tag 'LA.VENDOR.13.2.0.r1-15000-KAILUA.0' of https://git.codelinaro.org/clo/la/platform/hardware/qcom/thermal:
  thermal-hal: Add support for hal specific configuration.
  thermal_hal: Add support to handle CPUs with non-sequential core_ids
  thermal-hal: Add tsens,bcl configuration for kona
  thermal-hal: Add thermal HAL 2.0 support for KALAMA QCS, QCM
  thermal-hal: update cpu, vbat and socd sensor configurations for khaje
  thermal-hal: Add fan cdev type in thermal-hal support for Kalama HHG

1 files changed, 82 insertions, 27 deletions

diff --git a/thermalConfig.cpp b/thermalConfig.cpp
index 6c5a7e9..9ce4726 100644
--- a/thermalConfig.cpp
+++ b/thermalConfig.cpp
@@ -352,8 +352,9 @@ namespace implementation {
 
 	std::vector<std::string> cpu_sensors_khaje =
 	{
-		"cpuss-0",
-		"cpuss-1",
+		"cpuss-2",
+		"cpuss-2",
+		"cpuss-2",
 		"cpuss-2",
 		"cpu-1-0",
 		"cpu-1-1",
@@ -392,7 +393,7 @@ namespace implementation {
 		},
 		{
 			TemperatureType::BCL_VOLTAGE,
-			{ "pm7250b-vbat-lvl0" },
+			{ "vbat" },
 			"vbat",
 			3000,
 			2800,
@@ -410,12 +411,12 @@ namespace implementation {
 		},
 		{
 			TemperatureType::BCL_PERCENTAGE,
-			{ "soc" },
-			"soc",
-			10,
-			2,
-			10,
-			false,
+			{ "socd" },
+			"socd",
+			90,
+			99,
+			90,
+			true,
 		},
 	};
 
@@ -489,6 +490,54 @@ namespace implementation {
 		},
 	};
 
+	std::vector<std::string> cpu_sensors_monaco =
+	{
+		"cpuss-0",
+		"cpuss-1",
+		"cpuss-0",
+		"cpuss-1",
+	};
+
+	std::vector<struct target_therm_cfg> sensor_cfg_monaco =
+	{
+		{
+			TemperatureType::CPU,
+			cpu_sensors_monaco,
+			"",
+			95000,
+			115000,
+			95000,
+			true,
+		},
+		{
+			TemperatureType::GPU,
+			{ "gpu" },
+			"gpu",
+			95000,
+			115000,
+			95000,
+			true,
+		},
+		{
+			TemperatureType::SKIN,
+			{ "pa-therm0" },
+			"skin",
+			40000,
+			95000,
+			40000,
+			true,
+		},
+		{
+			TemperatureType::BCL_CURRENT,
+			{ "pm5100-ibat-lvl0" },
+			"ibat",
+			1100,
+			1500,
+			1100,
+			true,
+		},
+	};
+
 	std::vector<std::string> cpu_sensors_lito =
 	{
 		"cpu-0-0-usr",
@@ -668,14 +717,14 @@ namespace implementation {
 
 	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_common = {
@@ -759,7 +808,7 @@ namespace implementation {
 		},
 		{
 			TemperatureType::GPU,
-			{ "gpuss-0-usr" },
+			{ "gpuss-0" },
 			"GPU0",
 			95000,
 			115000,
@@ -768,7 +817,7 @@ namespace implementation {
 		},
 		{
 			TemperatureType::GPU,
-			{ "gpuss-1-usr" },
+			{ "gpuss-1" },
 			"GPU1",
 			95000,
 			115000,
@@ -777,7 +826,7 @@ namespace implementation {
 		},
 		{
 			TemperatureType::SKIN,
-			{ "skin-msm-therm-usr" },
+			{ "skin-msm-therm" },
 			"skin",
 			40000,
 			95000,
@@ -798,7 +847,7 @@ namespace implementation {
 		},
 		{
 			TemperatureType::BCL_VOLTAGE,
-			{ "pm8150b-vbat-lvl0" },
+			{ "vbat" },
 			"vbat",
 			3200,
 			3000,
@@ -807,16 +856,16 @@ namespace implementation {
 		},
 		{
 			TemperatureType::BCL_PERCENTAGE,
-			{ "soc" },
-			"soc",
-			10,
-			2,
-			10,
+			{ "socd" },
+			"socd",
+			90,
+			99,
+			90,
 			false,
 		},
 		{
 			TemperatureType::NPU,
-			{ "npu-usr" },
+			{ "npu" },
 			"npu",
 			95000,
 			115000,
@@ -1776,6 +1825,10 @@ namespace implementation {
 		{536, kalama_common}, //Kalamap
 		{600, kalama_common}, //Kalama_sg
 		{601, kalama_common}, //Kalamap_sg
+		{603, kalama_common}, //Kalama_qcs
+		{604, kalama_common}, //Kalama_qcm
+		{486, sensor_cfg_monaco}, // monaco
+		{517, sensor_cfg_monaco}, // monaco
 	};
 
 	const std::unordered_map<int, std::vector<struct target_therm_cfg>>
@@ -1811,6 +1864,8 @@ namespace implementation {
 		{536, kalama_specific}, //Kalamap
 		{600, kalama_specific}, //Kalama_sg
 		{601, kalama_specific}, //Kalamap_sg
+		{603, kalama_specific}, //Kalama_qcs
+		{604, kalama_specific}, //Kalama_qcm
 	};
 
 	const std::unordered_map<int, bool>