Merge 92c9767dbbad293174056631ea93a75c4669bd2c on remote branch

Change-Id: Ib5114d5ccc5330e8266ba59a71c4c1b7c51991ac
diff --git a/thermalConfig.cpp b/thermalConfig.cpp
index a1aeee3..16d8f7a 100644
--- a/thermalConfig.cpp
+++ b/thermalConfig.cpp
@@ -1039,6 +1039,87 @@
 		},
 	};
 
+	std::vector<std::string> cpu_sensors_crow =
+	{
+		"cpu-0-0",
+		"cpu-0-1",
+		"cpu-0-2",
+		"cpu-0-3",
+		"cpu-1-0",
+		"cpu-1-2",
+		"cpu-1-4",
+		"cpu-1-6",
+	};
+
+	std::vector<struct target_therm_cfg>  crow_common = {
+		{
+			TemperatureType::CPU,
+			cpu_sensors_crow,
+			"",
+			95000,
+			115000,
+			95000,
+			true,
+		},
+		{
+			TemperatureType::GPU,
+			{ "gpuss-0" },
+			"GPU0",
+			95000,
+			115000,
+			95000,
+			true,
+		},
+		{
+			TemperatureType::GPU,
+			{ "gpuss-1" },
+			"GPU1",
+			95000,
+			115000,
+			95000,
+			true,
+		},
+		{
+			TemperatureType::NPU,
+			{ "nspss-0" },
+			"nsp0",
+			100000,
+			115000,
+			100000,
+			true,
+		},
+		{
+			TemperatureType::NPU,
+			{ "nspss-1" },
+			"nsp1",
+			100000,
+			115000,
+			100000,
+			true,
+		},
+		{
+			TemperatureType::NPU,
+			{ "nspss-2" },
+			"nsp2",
+			100000,
+			115000,
+			100000,
+			true,
+		},
+	};
+
+	std::vector<struct target_therm_cfg>  crow_specific = {
+		{
+			TemperatureType::SKIN,
+			{ "sys-therm-3" },
+			"skin",
+			60000,
+			95000,
+			60000,
+			true,
+		},
+	};
+
 	std::vector<struct target_therm_cfg>  diwali_specific = {
 		{
 			TemperatureType::BCL_CURRENT,
@@ -1146,6 +1227,7 @@
 		{604, kalama_common}, //Kalama_qcm
 		{486, sensor_cfg_monaco}, // monaco
 		{517, sensor_cfg_monaco}, // monaco
+		{608, crow_common}, //crow
 	};
 
 	const std::unordered_map<int, std::vector<struct target_therm_cfg>>
@@ -1170,6 +1252,7 @@
 		{601, kalama_specific}, //Kalamap_sg
 		{603, kalama_specific}, //Kalama_qcs
 		{604, kalama_specific}, //Kalama_qcm
+		{608, crow_specific}, //crow
 	};
 
 	std::vector<struct target_therm_cfg> add_target_config(