summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaisuke Nojiri <dnojiri@chromium.org>2018-06-06 10:48:10 -0700
committerChromeOS Commit Bot <chromeos-commit-bot@chromium.org>2018-06-07 21:43:46 +0000
commit77997e8422b1ef5d511019a8a1e38fa743eab082 (patch)
tree02c8da1e5ac5100cb12940b098655d1412fb0bc8
parenteb92965cce47fe0acd95440a6cefaf07666bf98d (diff)
downloadchrome-ec-77997e8422b1ef5d511019a8a1e38fa743eab082.tar.gz
Fizz: Add Wukong for BJ configuration
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org> BUG=b:71524814 BRANCH=none TEST=None Change-Id: I70deadb6f8c01c36d13f186e95244dc7a317fcbb Reviewed-on: https://chromium-review.googlesource.com/1090326 Reviewed-by: Vincent Palatin <vpalatin@chromium.org> Tested-by: Daisuke Nojiri <dnojiri@chromium.org> Commit-Queue: Daisuke Nojiri <dnojiri@chromium.org>
-rw-r--r--board/fizz/board.c10
-rw-r--r--board/fizz/board.h4
2 files changed, 9 insertions, 5 deletions
diff --git a/board/fizz/board.c b/board/fizz/board.c
index 8938535111..da25199a9e 100644
--- a/board/fizz/board.c
+++ b/board/fizz/board.c
@@ -672,7 +672,9 @@ static void setup_fan(void)
fans[FAN_CH_0].rpm = &fan_rpm_1;
fan_table = fan_table1;
break;
- case OEM_WUKONG:
+ case OEM_WUKONG_N:
+ case OEM_WUKONG_A:
+ case OEM_WUKONG_M:
fans[FAN_CH_0].rpm = &fan_rpm_0;
fan_table = fan_table2;
break;
@@ -719,10 +721,10 @@ static void setup_bj(void)
break;
case OEM_TEEMO:
case OEM_BLEEMO:
- bj = (BJ_ADAPTER_90W_MASK & (1 << sku)) ?
- BJ_90W_19V : BJ_65W_19V;
- break;
case OEM_SION:
+ case OEM_WUKONG_N:
+ case OEM_WUKONG_A:
+ case OEM_WUKONG_M:
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 20d12e47ae..f0983f11fe 100644
--- a/board/fizz/board.h
+++ b/board/fizz/board.h
@@ -231,7 +231,9 @@ enum OEM_ID {
OEM_KENCH = 0,
OEM_TEEMO = 1,
OEM_SION = 2,
- OEM_WUKONG = 3,
+ OEM_WUKONG_N = 3,
+ OEM_WUKONG_A = 4,
+ OEM_WUKONG_M = 5,
OEM_BLEEMO = 6,
/* Number of OEM IDs */
OEM_COUNT