summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Chase <jnchase@google.com>2020-02-10 12:19:36 -0500
committerCommit Bot <commit-bot@chromium.org>2020-02-14 05:17:25 +0000
commit9e176de1b75d81d1fb0728fed94a1c9d78b516cf (patch)
treed8e63c38dcf9d8237fcc44071ca8c0f392108e6a
parent93805b9b52f7f8daf616b0d1f90f01bba4a545f8 (diff)
downloadchrome-ec-9e176de1b75d81d1fb0728fed94a1c9d78b516cf.tar.gz
Fizz: add fan table for excelsior
BUG=b:149103675 BRANCH=none TEST=build, install, set OEM to 10, check fan speed, set min fan speed Change-Id: I032c48c5d7696a482b0cf4083b88dcd4f341f434 Signed-off-by: Jeff Chase <jnchase@google.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2047931 Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org> Reviewed-by: Ren Kuo <ren.kuo@quanta.corp-partner.google.com> Reviewed-by: David Huang <David.Huang@quantatw.com> (cherry picked from commit 50b268bc67c1c73d81eafaa46dc7cab75c335e41) Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2051326 Tested-by: Peter Ou <peter.ou@quanta.corp-partner.google.com>
-rw-r--r--board/fizz/board.c16
-rw-r--r--board/fizz/board.h1
2 files changed, 17 insertions, 0 deletions
diff --git a/board/fizz/board.c b/board/fizz/board.c
index 5198e1974b..315aa8968e 100644
--- a/board/fizz/board.c
+++ b/board/fizz/board.c
@@ -643,10 +643,21 @@ static const struct fan_step fan_table2[] = {
{.on = 87, .off = 81, .rpm = 3900},
{.on = 98, .off = 91, .rpm = 5000},
};
+static const struct fan_step fan_table3[] = {
+ {.on = 0, .off = 1, .rpm = 0},
+ {.on = 36, .off = 22, .rpm = 2500},
+ {.on = 54, .off = 49, .rpm = 3200},
+ {.on = 61, .off = 56, .rpm = 3500},
+ {.on = 68, .off = 63, .rpm = 3900},
+ {.on = 75, .off = 69, .rpm = 4500},
+ {.on = 82, .off = 76, .rpm = 5100},
+ {.on = 92, .off = 85, .rpm = 5400},
+};
/* All fan tables must have the same number of levels */
#define NUM_FAN_LEVELS ARRAY_SIZE(fan_table0)
BUILD_ASSERT(ARRAY_SIZE(fan_table1) == NUM_FAN_LEVELS);
BUILD_ASSERT(ARRAY_SIZE(fan_table2) == NUM_FAN_LEVELS);
+BUILD_ASSERT(ARRAY_SIZE(fan_table3) == NUM_FAN_LEVELS);
static void setup_fan(void)
{
@@ -672,6 +683,10 @@ static void setup_fan(void)
case OEM_JAX:
fan_set_count(0);
break;
+ case OEM_EXCELSIOR:
+ fans[FAN_CH_0].rpm = &fan_rpm_0;
+ fan_table = fan_table3;
+ break;
}
}
@@ -738,6 +753,7 @@ static void setup_bj(void)
case OEM_WUKONG_N:
case OEM_WUKONG_A:
case OEM_WUKONG_M:
+ case OEM_EXCELSIOR:
bj = (BJ_ADAPTER_90W_MASK & (1 << sku)) ?
BJ_90W_19V : BJ_65W_19V;
break;
diff --git a/board/fizz/board.h b/board/fizz/board.h
index 56b20ef0de..afaae4dae5 100644
--- a/board/fizz/board.h
+++ b/board/fizz/board.h
@@ -238,6 +238,7 @@ enum OEM_ID {
OEM_WUKONG_M = 5,
OEM_BLEEMO = 6,
OEM_JAX = 8,
+ OEM_EXCELSIOR = 10,
/* Number of OEM IDs */
OEM_COUNT
};