diff options
| author | YongBeum.Ha <ybha@samsung.corp-partner.google.com> | 2020-04-01 15:13:14 +0900 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-04-03 16:37:42 +0000 |
| commit | 9cb7d8ed495d0141689a427fb80e9293b1d1bde4 (patch) | |
| tree | 5c68c45efc21d7818e7344ac323bcc5d91a4e147 | |
| parent | 9b7f20c481ae546a73c47bdc34032256e06666be (diff) | |
| download | chrome-ec-9cb7d8ed495d0141689a427fb80e9293b1d1bde4.tar.gz | |
nightfury : Enable PWM and Tach for Fan
Enable PWM and Tach to control fan
BUG=b:149226871
BRANCH=firmware-hatch-12672.B
TEST=make -j BOARD=nightfury
Signed-off-by: YongBeum.Ha <ybha@samsung.corp-partner.google.com>
Change-Id: I9ce748d81c1015565a37b2fb0d29792df4a8997a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2130148
Reviewed-by: Bob Moragues <moragues@chromium.org>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
(cherry picked from commit 34dfe4c7df343eb656955c8f0ab230c1b450d7e7)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2134332
Tested-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Commit-Queue: Tim Wawrzynczak <twawrzynczak@chromium.org>
| -rw-r--r-- | board/nightfury/board.c | 6 | ||||
| -rw-r--r-- | board/nightfury/gpio.inc | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/board/nightfury/board.c b/board/nightfury/board.c index 123e068950..dd97e7b198 100644 --- a/board/nightfury/board.c +++ b/board/nightfury/board.c @@ -316,9 +316,9 @@ const struct fan_conf fan_conf_0 = { /* Default */ const struct fan_rpm fan_rpm_0 = { - .rpm_min = 3100, - .rpm_start = 3100, - .rpm_max = 6900, + .rpm_min = 1000, + .rpm_start = 1000, + .rpm_max = 5900, }; const struct fan_t fans[FAN_CH_COUNT] = { diff --git a/board/nightfury/gpio.inc b/board/nightfury/gpio.inc index 29dbd6f72a..9dadfd3bfd 100644 --- a/board/nightfury/gpio.inc +++ b/board/nightfury/gpio.inc @@ -150,6 +150,8 @@ ALTERNATE(PIN_MASK(6, 0x30), 0, MODULE_UART, 0) /* UA /* PWM */ ALTERNATE(PIN_MASK(8, 0x01), 0, MODULE_PWM, 0) /* PWM3 - Keyboard backlight */ +ALTERNATE(PIN_MASK(B, 0x80), 0, MODULE_PWM, 0) /* PWM5 - FAN */ +ALTERNATE(PIN_MASK(4, 0x01), 0, MODULE_PWM, 0) /* TA1 - Fan Tachometer */ /* ADC */ ALTERNATE(PIN_MASK(4, 0x3C), 0, MODULE_ADC, 0) /* ADC0-3 */ |