summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorKeith Short <keithshort@chromium.org>2019-11-22 16:56:56 -0700
committerCommit Bot <commit-bot@chromium.org>2019-12-04 00:02:47 +0000
commita1f2cfe2146c818be848876a24415a72ad36933c (patch)
treed87d5883382e123154fe38675b4e0c885117f168 /board
parent4e8dbf5c9b1dee8e6ee1734af58f2ba204045e5c (diff)
downloadchrome-ec-a1f2cfe2146c818be848876a24415a72ad36933c.tar.gz
volteer: enable thermal management
Configure fan for PWM operation. Enable thermal management policies. BUG=b:143768086 BRANCH=none TEST=make buildall TEST=use 'thermalset' to force high and halt temperature conditions, verify AP is alerted and halted Change-Id: I6362ce9d5a0edbd231e3f9464dfccf34d4f1c7a0 Signed-off-by: Keith Short <keithshort@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1946774 Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Diffstat (limited to 'board')
-rw-r--r--board/volteer/gpio.inc7
1 files changed, 5 insertions, 2 deletions
diff --git a/board/volteer/gpio.inc b/board/volteer/gpio.inc
index 3e6042b4b8..a098509fe2 100644
--- a/board/volteer/gpio.inc
+++ b/board/volteer/gpio.inc
@@ -91,8 +91,6 @@ GPIO(EN_PP3300_AG, PIN(8, 5), GPIO_OUT_LOW)
* default. */
GPIO(LED_SIDESEL_4_L, PIN(6, 0), GPIO_OUT_LOW)
-GPIO(EN_PP5000_FAN, PIN(6, 1), GPIO_OUT_LOW)
-
/*
* eDP backlight - both PCH and EC have enable pins that must be high
* for the backlight to turn on. Default state is high, and can be turned
@@ -131,6 +129,11 @@ ALTERNATE(PIN_MASK(B, BIT(3) | BIT(2)), 0, MODULE_I2C, 0)
ALTERNATE(PIN_MASK(C, BIT(2) | BIT(3) | BIT(4)), 0, MODULE_PWM, 0) /* LED{3,2,1}_L */
+/* Fan signals */
+GPIO(EN_PP5000_FAN, PIN(6, 1), GPIO_OUT_LOW)
+ALTERNATE(PIN_MASK(B, BIT(7)), 0, MODULE_PWM, 0) /* FAN_PWM */
+ALTERNATE(PIN_MASK(4, BIT(0)), 0, MODULE_PWM, 0) /* FAN_SPEED_TACH */
+
/* Keyboard pins */
#define GPIO_KB_INPUT (GPIO_INPUT | GPIO_PULL_UP)
ALTERNATE(PIN_MASK(3, 0x03), 0, MODULE_KEYBOARD_SCAN, GPIO_KB_INPUT) /* KSI_00-01 */