From 2aae9d678a500cab94ad7f0747940de9e01d8a6e Mon Sep 17 00:00:00 2001 From: Bill Richardson Date: Fri, 1 Nov 2013 11:23:52 -0700 Subject: samus: configure both fans Modify board.h and board.c to describe both fans. BUG=chrome-os-partner:23530 BRANCH=samus TEST=manual Power things up, poke at the fans through the EC console. Observe that they're both working and controllable: faninfo fanset 0 2000 faninfo fanduty 1 30 faninfo fanauto 0 faninfo fanauto 1 faninfo Change-Id: I2ba9356f084be12dab0fe0b9a004f66feace1878 Signed-off-by: Bill Richardson Reviewed-on: https://chromium-review.googlesource.com/175369 --- board/samus/board.c | 13 ++++++++++--- board/samus/board.h | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/board/samus/board.c b/board/samus/board.c index 2fccd9d310..7e3aa5c51e 100644 --- a/board/samus/board.c +++ b/board/samus/board.c @@ -198,10 +198,17 @@ BUILD_ASSERT(ARRAY_SIZE(pwm_channels) == PWM_CH_COUNT); const struct fan_t fans[] = { {.flags = FAN_USE_RPM_MODE, .rpm_min = 1000, - .rpm_max = 5050, + .rpm_max = 6500, .ch = 2, - .pgood_gpio = -1, /* HEY */ - .enable_gpio = -1, /* HEY */ + .pgood_gpio = -1, + .enable_gpio = -1, + }, + {.flags = FAN_USE_RPM_MODE, + .rpm_min = 1000, + .rpm_max = 6500, + .ch = 3, + .pgood_gpio = -1, + .enable_gpio = -1, }, }; BUILD_ASSERT(ARRAY_SIZE(fans) == CONFIG_FANS); diff --git a/board/samus/board.h b/board/samus/board.h index c8c9dfda1a..e32ee8beb3 100644 --- a/board/samus/board.h +++ b/board/samus/board.h @@ -34,7 +34,7 @@ #define CONFIG_CHARGER_SENSE_RESISTOR 10 #define CONFIG_CHARGER_SENSE_RESISTOR_AC 10 #define CONFIG_CHARGER_INPUT_CURRENT 2000 -#define CONFIG_FANS 1 /* HEY */ +#define CONFIG_FANS 2 #define CONFIG_PWM #define CONFIG_PWM_KBLIGHT #define CONFIG_SWITCH_DEDICATED_RECOVERY -- cgit v1.2.1