diff options
| author | Daisuke Nojiri <dnojiri@chromium.org> | 2018-04-16 18:57:13 +0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-06-29 17:50:16 -0700 |
| commit | 63bad07288d96a9595fd0a0f97727fff10aedb55 (patch) | |
| tree | f7adc7e753e3da5dbbf6c3e884a744046dee0e61 /board/nami | |
| parent | fc7a1d5353d969610435f14e8a52bb1e99578c94 (diff) | |
| download | chrome-ec-63bad07288d96a9595fd0a0f97727fff10aedb55.tar.gz | |
Nami: Add fan configurations for Sona and Pantheon
Nami family share the same code but use different fans. This patch
adds different rpm configuration for Sona and Pantheon.
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
BUG=b:78043593,b:80152440
BRANCH=none
TEST=Verify fan control by faninfo and fanset after cold reboot,
suspend/resume, warm reboot on Sona.
Change-Id: Idd82c649d6a381f10a22125b3dcf9de65874875c
Reviewed-on: https://chromium-review.googlesource.com/1110486
Commit-Ready: Daisuke Nojiri <dnojiri@chromium.org>
Tested-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Diffstat (limited to 'board/nami')
| -rw-r--r-- | board/nami/board.c | 32 |
1 files changed, 30 insertions, 2 deletions
diff --git a/board/nami/board.c b/board/nami/board.c index e846925d0a..5dd7763d11 100644 --- a/board/nami/board.c +++ b/board/nami/board.c @@ -161,12 +161,27 @@ const struct fan_conf fan_conf_0 = { .enable_gpio = -1, }; +/* Default, Nami, Vayne */ const struct fan_rpm fan_rpm_0 = { - .rpm_min = 2800, - .rpm_start = 3000, + .rpm_min = 3100, + .rpm_start = 3100, + .rpm_max = 6900, +}; + +/* Sona */ +const struct fan_rpm fan_rpm_1 = { + .rpm_min = 2700, + .rpm_start = 2700, .rpm_max = 6000, }; +/* Pantheon */ +const struct fan_rpm fan_rpm_2 = { + .rpm_min = 2100, + .rpm_start = 2300, + .rpm_max = 5100, +}; + struct fan_t fans[FAN_CH_COUNT] = { [FAN_CH_0] = { .conf = &fan_conf_0, .rpm = &fan_rpm_0, }, }; @@ -715,6 +730,17 @@ static void board_chipset_suspend(void) } DECLARE_HOOK(HOOK_CHIPSET_SUSPEND, board_chipset_suspend, HOOK_PRIO_DEFAULT); +static void setup_fans(void) +{ + if (oem == PROJECT_SONA) + fans[FAN_CH_0].rpm = &fan_rpm_1; + else if (oem == PROJECT_PANTHEON) + fans[FAN_CH_0].rpm = &fan_rpm_2; +} + +/* + * Read CBI from i2c eeprom and initialize variables for board variants + */ static void cbi_init(void) { uint32_t val; @@ -734,6 +760,8 @@ static void cbi_init(void) if (board_version < 0x300) /* Previous boards have GPIO42 connected to TP_INT_CONN */ gpio_set_flags(GPIO_USB2_ID, GPIO_INPUT); + + setup_fans(); } DECLARE_HOOK(HOOK_INIT, cbi_init, HOOK_PRIO_INIT_I2C + 1); |