jinlon: update thermal table for board version 3

BUG=b:154564062
BRANCH=firmware-hatch-12672.B
TEST=thermal team verified thermal policy is expected.

Change-Id: I8455facfe534208ac41bd4a25f803c83e40dad8e
Signed-off-by: Devin Lu <Devin.Lu@quantatw.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2157343
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>

2 files changed, 46 insertions, 48 deletions

diff --git a/board/jinlon/board.c b/board/jinlon/board.c
index c20e5cc65f..aa9e6d2c6b 100644
--- a/board/jinlon/board.c
+++ b/board/jinlon/board.c
@@ -351,12 +351,10 @@ const static struct ec_thermal_config thermal_a = {
 	.temp_host = {
 		[EC_TEMP_THRESH_WARN] = 0,
 		[EC_TEMP_THRESH_HIGH] = C_TO_K(75),
-		[EC_TEMP_THRESH_HALT] = C_TO_K(85),
 	},
 	.temp_host_release = {
 		[EC_TEMP_THRESH_WARN] = 0,
 		[EC_TEMP_THRESH_HIGH] = C_TO_K(65),
-		[EC_TEMP_THRESH_HALT] = 0,
 	},
 	.temp_fan_off = C_TO_K(25),
 	.temp_fan_max = C_TO_K(70),
@@ -366,7 +364,7 @@ const static struct ec_thermal_config thermal_b = {
 	.temp_host = {
 		[EC_TEMP_THRESH_WARN] = 0,
 		[EC_TEMP_THRESH_HIGH] = C_TO_K(75),
-		[EC_TEMP_THRESH_HALT] = C_TO_K(75),
+		[EC_TEMP_THRESH_HALT] = C_TO_K(86),
 	},
 	.temp_host_release = {
 		[EC_TEMP_THRESH_WARN] = 0,
diff --git a/board/jinlon/thermal.c b/board/jinlon/thermal.c
index a997d587d4..417c1436e6 100644
--- a/board/jinlon/thermal.c
+++ b/board/jinlon/thermal.c
@@ -40,102 +40,102 @@ static const struct fan_step *fan_step_table;
 static const struct fan_step fan_table_clamshell[] = {
 	{
 		/* level 0 */
-		.on = {0, -1, 54, 45},
-		.off = {99, -1, 52, 0},
+		.on = {0, -1, 54, 34},
+		.off = {99, -1, 99, 99},
 		.rpm = {0, 0},
 	},
 	{
 		/* level 1 */
-		.on = {0, -1, 56, 46},
-		.off = {99, -1, 54, 45},
-		.rpm = {4200, 4700},
+		.on = {0, -1, 57, 35},
+		.off = {99, -1, 54, 34},
+		.rpm = {3950, 3850},
 	},
 	{
 		/* level 2 */
-		.on = {0, -1, 58, 47},
-		.off = {99, -1, 56, 46},
-		.rpm = {4400, 4900},
+		.on = {0, -1, 58, 36},
+		.off = {99, -1, 57, 35},
+		.rpm = {4200, 4100},
 	},
 	{
 		/* level 3 */
-		.on = {0, -1, 60, 48},
-		.off = {99, -1, 58, 47},
-		.rpm = {4600, 5100},
+		.on = {0, -1, 59, 37},
+		.off = {99, -1, 58, 36},
+		.rpm = {4550, 4450},
 	},
 	{
 		/* level 4 */
-		.on = {80, -1, 62, 49},
-		.off = {74, -1, 60, 48},
-		.rpm = {4800, 5300},
+		.on = {60, -1, 60, 38},
+		.off = {58, -1, 59, 37},
+		.rpm = {4900, 4800},
 	},
 	{
 		/* level 5 */
-		.on = {85, -1, 64, 50},
-		.off = {79, -1, 62, 49},
-		.rpm = {5200, 5700},
+		.on = {62, -1, 61, 39},
+		.off = {60, -1, 60, 38},
+		.rpm = {5250, 5150},
 	},
 	{
 		/* level 6 */
-		.on = {90, -1, 66, 51},
-		.off = {84, -1, 64, 50},
-		.rpm = {5600, 6100},
+		.on = {65, -1, 62, 40},
+		.off = {62, -1, 61, 39},
+		.rpm = {5400, 5300},
 	},
 	{
 		/* level 7 */
-		.on = {127, -1, 127, 127},
-		.off = {89, -1, 66, 51},
-		.rpm = {6000, 6500},
+		.on = {100, -1, 100, 100},
+		.off = {65, -1, 62, 40},
+		.rpm = {6000, 5900},
 	},
 };
 
 static const struct fan_step fan_table_tablet[] = {
 	{
 		/* level 0 */
-		.on = {0, -1, 40, 42},
-		.off = {99, -1, 0, 0},
+		.on = {0, -1, 55, 39},
+		.off = {99, -1, 99, 99},
 		.rpm = {0, 0},
 	},
 	{
 		/* level 1 */
-		.on = {0, -1, 42, 43},
-		.off = {99, -1, 37, 42},
+		.on = {0, -1, 56, 40},
+		.off = {99, -1, 55, 39},
 		.rpm = {0, 0},
 	},
 	{
 		/* level 2 */
-		.on = {0, -1, 44, 44},
-		.off = {99, -1, 39, 43},
-		.rpm = {0, 0},
+		.on = {0, -1, 57, 41},
+		.off = {99, -1, 56, 40},
+		.rpm = {4000, 3350},
 	},
 	{
 		/* level 3 */
-		.on = {0, -1, 46, 45},
-		.off = {99, -1, 41, 44},
-		.rpm = {0, 0},
+		.on = {0, -1, 58, 42},
+		.off = {99, -1, 57, 41},
+		.rpm = {4200, 3400},
 	},
 	{
 		/* level 4 */
-		.on = {80, -1, 48, 46},
-		.off = {74, -1, 43, 45},
-		.rpm = {4800, 5300},
+		.on = {60, -1, 59, 43},
+		.off = {58, -1, 58, 42},
+		.rpm = {4400, 3500},
 	},
 	{
 		/* level 5 */
-		.on = {85, -1, 50, 47},
-		.off = {79, -1, 45, 46},
-		.rpm = {5200, 5700},
+		.on = {62, -1, 60, 44},
+		.off = {60, -1, 59, 43},
+		.rpm = {4800, 4350},
 	},
 	{
 		/* level 6 */
-		.on = {90, -1, 65, 60},
-		.off = {84, -1, 47, 47},
-		.rpm = {5600, 6100},
+		.on = {65, -1, 61, 45},
+		.off = {62, -1, 60, 44},
+		.rpm = {5000, 4500},
 	},
 	{
 		/* level 7 */
-		.on = {127, -1, 127, 127},
-		.off = {89, -1, 57, 53},
-		.rpm = {6000, 6500},
+		.on = {100, -1, 100, 100},
+		.off = {65, -1, 61, 45},
+		.rpm = {5200, 5100},
 	},
 };