diff options
| author | Daisuke Nojiri <dnojiri@chromium.org> | 2018-06-21 11:19:22 -0700 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2018-11-20 19:01:06 +0000 |
| commit | e54a1a2d6be3d462e71314b8977d7861bcc02706 (patch) | |
| tree | aa903a1edf6bd7d0d1fa1a899a7f7be69f4d26e6 | |
| parent | e9595b45555429a22e281b70a3febbad18568a01 (diff) | |
| download | chrome-ec-e54a1a2d6be3d462e71314b8977d7861bcc02706.tar.gz | |
fan: Don't enable or disable thermal control on resume
We don't need to enable or disable thermal control on the resume path.
It should be already enabled by pwm_fan_init on cold boot or by
pwm_fan_S3_S5 on warm reboot. If it needs to be disabled, DPTF and
host command will do so
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
BUG=none
BRANCH=none
TEST=Verify fan spins as expected on Nami and Fizz.
Change-Id: If6e4ecdf328b24cc5ba86dbc3bc2824610fcd340
Reviewed-on: https://chromium-review.googlesource.com/1110485
Commit-Ready: Daisuke Nojiri <dnojiri@chromium.org>
Tested-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/1344570
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Commit-Queue: Daisuke Nojiri <dnojiri@chromium.org>
| -rw-r--r-- | common/fan.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/common/fan.c b/common/fan.c index 6b618575a6..29c7d508a9 100644 --- a/common/fan.c +++ b/common/fan.c @@ -510,11 +510,10 @@ static void pwm_fan_resume(void) { int fan; for (fan = 0; fan < CONFIG_FANS; fan++) { -#ifdef CONFIG_FAN_RPM_CUSTOM - set_thermal_control_enabled(fan, 1); -#else - set_thermal_control_enabled(fan, 0); -#endif + /* We don't enable or disable thermal control here. + * It should be already enabled by pwm_fan_init on cold boot + * or by pwm_fan_S3_S5 on warm reboot. If it needs + * to be disabled, DPTF and host command will do so. */ fan_set_rpm_target(FAN_CH(fan), fan_percent_to_rpm(FAN_CH(fan), CONFIG_FAN_INIT_SPEED)); |