summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaisuke Nojiri <dnojiri@chromium.org>2018-06-20 19:46:12 -0700
committerChromeOS Commit Bot <chromeos-commit-bot@chromium.org>2018-11-20 19:01:04 +0000
commite9595b45555429a22e281b70a3febbad18568a01 (patch)
tree14d92e01b8cc85c9dc78fe6b621957f5da865914
parent380d42e7e7078bdc5183f227fb7bfadc4eb699e0 (diff)
downloadchrome-ec-e9595b45555429a22e281b70a3febbad18568a01.tar.gz
Nami: Set fan speed to CONFIG_FAN_INIT_SPEED on resume
This patch sets the target RPM to CONFIG_FAN_INIT_SPEED on chipset resume. Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org> BUG=b:80152440 BRANCH=none TEST=Verify target RPM is set to the value derived from CONFIG_FAN_INIT_SPEED in recovery mode on Akali. Change-Id: Ide0d6b8a0c895479af8afff0ba40a7b502bbbbbf Reviewed-on: https://chromium-review.googlesource.com/1110349 Commit-Ready: Daisuke Nojiri <dnojiri@chromium.org> Tested-by: Daisuke Nojiri <dnojiri@chromium.org> Reviewed-by: Vincent Palatin <vpalatin@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/1344569 Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org> Commit-Queue: Daisuke Nojiri <dnojiri@chromium.org>
-rw-r--r--common/fan.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/common/fan.c b/common/fan.c
index d193240150..6b618575a6 100644
--- a/common/fan.c
+++ b/common/fan.c
@@ -515,7 +515,9 @@ static void pwm_fan_resume(void)
#else
set_thermal_control_enabled(fan, 0);
#endif
- fan_set_rpm_target(FAN_CH(fan), fans[fan].rpm->rpm_max);
+ fan_set_rpm_target(FAN_CH(fan),
+ fan_percent_to_rpm(FAN_CH(fan),
+ CONFIG_FAN_INIT_SPEED));
set_enabled(fan, 1);
}
}