From 9105216a996424db42cb04e416cb64d684052c0a Mon Sep 17 00:00:00 2001 From: David Huang Date: Mon, 25 May 2015 19:42:51 +0800 Subject: Gandof: Update thermal table Update Thermal table v1 for Ganndof. on off RPM step0 0 step1 31 27 4200 step2 39 35 5000 step3 47 43 5700 step4 54 51 6400 step5 61 58 7100 ec warning point: 66 ec high point: 85 ec shutdown point: 100 BRANCH=gandof BUG=chrome-os-partner:40588 TEST=Use the hacked code to return the fake temperature, check all the steps with Gandof. The fan behavior works properly. Change-Id: I6c22b62ac13556a0a36edbe48f31e745bbbcde75 Signed-off-by: David Huang Reviewed-on: https://chromium-review.googlesource.com/273091 Reviewed-by: David Wu Reviewed-by: Mohammed Habibulla Commit-Queue: David Wu --- board/gandof/board.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/board/gandof/board.c b/board/gandof/board.c index 7a7bac0564..49d8cc187d 100644 --- a/board/gandof/board.c +++ b/board/gandof/board.c @@ -36,7 +36,7 @@ #include "gpio_list.h" #ifdef CONFIG_FAN_RPM_CUSTOM -#define NUM_FAN_LEVELS 8 +#define NUM_FAN_LEVELS 6 struct fan_step { int on; @@ -47,13 +47,11 @@ struct fan_step { /* Do not make the fan on/off point equal to 0 or 100 */ const struct fan_step fan_table[NUM_FAN_LEVELS] = { {.rpm = 0}, - {.on = 9, .off = 1, .rpm = 3200}, - {.on = 20, .off = 12, .rpm = 3700}, - {.on = 31, .off = 23, .rpm = 4000}, - {.on = 37, .off = 29, .rpm = 4400}, - {.on = 40, .off = 32, .rpm = 4900}, - {.on = 59, .off = 51, .rpm = 5500}, - {.on = 98, .off = 90, .rpm = 6500}, + {.on = 11, .off = 2, .rpm = 4200}, + {.on = 36, .off = 25, .rpm = 5000}, + {.on = 58, .off = 47, .rpm = 5700}, + {.on = 77, .off = 69, .rpm = 6400}, + {.on = 97, .off = 88, .rpm = 7100}, }; int fan_percent_to_rpm(int fan, int pct) @@ -142,8 +140,8 @@ BUILD_ASSERT(ARRAY_SIZE(pwm_channels) == PWM_CH_COUNT); /* Physical fans. These are logically separate from pwm_channels. */ const struct fan_t fans[] = { {.flags = FAN_USE_RPM_MODE, - .rpm_min = 3200, - .rpm_max = 6500, + .rpm_min = 4200, + .rpm_max = 7100, .ch = 2, .pgood_gpio = GPIO_PP5000_PGOOD, .enable_gpio = GPIO_PP5000_FAN_EN, @@ -174,7 +172,7 @@ BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT); */ struct ec_thermal_config thermal_params[] = { /* Only the AP affects the thermal limits and fan speed. */ - {{C_TO_K(95), C_TO_K(97), C_TO_K(105)}, C_TO_K(32), C_TO_K(96)}, + {{C_TO_K(66), C_TO_K(80), C_TO_K(100)}, C_TO_K(26), C_TO_K(62)}, {{0, 0, 0}, 0, 0}, {{0, 0, 0}, 0, 0}, {{0, 0, 0}, 0, 0}, -- cgit v1.2.1