diff options
| author | Daisuke Nojiri <dnojiri@chromium.org> | 2018-03-05 09:49:40 -0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-03-06 09:59:21 -0800 |
| commit | 7f4018c41f875c7fbdff03ee4a489753d541b0a9 (patch) | |
| tree | cf8542ac7aac61530afecbc5161a660ccf335ccf /board/fizz | |
| parent | 9ea3cbecb8d3fca58baf4aff8d7e97480fe25860 (diff) | |
| download | chrome-ec-7f4018c41f875c7fbdff03ee4a489753d541b0a9.tar.gz | |
fan: Allow board to configure fans at run time
This patch splits struct fan_t into two parts: base configuration
and RPM configuration. RPMs are expected to be different from
model to model while a base configuration is most likely shared.
BUG=b:73720175
BRANCH=none
TEST=make buildall
Change-Id: Iff17573f110e07e88d097dd848cf91ee98b83176
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/949382
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Diffstat (limited to 'board/fizz')
| -rw-r--r-- | board/fizz/board.c | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/board/fizz/board.c b/board/fizz/board.c index 212d609f81..24d31a99c8 100644 --- a/board/fizz/board.c +++ b/board/fizz/board.c @@ -150,16 +150,21 @@ BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT); /******************************************************************************/ /* Physical fans. These are logically separate from pwm_channels. */ -const struct fan_t fans[] = { - [FAN_CH_0] = { - .flags = FAN_USE_RPM_MODE, - .rpm_min = 2800, - .rpm_start = 2800, - .rpm_max = 5600, - .ch = MFT_CH_0, /* Use MFT id to control fan */ - .pgood_gpio = -1, - .enable_gpio = GPIO_FAN_PWR_EN, - }, +const struct fan_conf fan_conf_0 = { + .flags = FAN_USE_RPM_MODE, + .ch = MFT_CH_0, /* Use MFT id to control fan */ + .pgood_gpio = -1, + .enable_gpio = GPIO_FAN_PWR_EN, +}; + +const struct fan_rpm fan_rpm_0 = { + .rpm_min = 2800, + .rpm_start = 2800, + .rpm_max = 5600, +}; + +struct fan_t fans[] = { + [FAN_CH_0] = { .conf = &fan_conf_0, .rpm = &fan_rpm_0, }, }; BUILD_ASSERT(ARRAY_SIZE(fans) == FAN_CH_COUNT); @@ -660,7 +665,7 @@ static int get_custom_rpm(int fan, int pct, int oem_id) previous_pct = pct; if (fan_table[current_level].rpm != - fan_get_rpm_target(fans[fan].ch)) + fan_get_rpm_target(FAN_CH(fan))) cprintf(CC_THERMAL, "[%T Setting fan RPM to %d]\n", fan_table[current_level].rpm); |