summaryrefslogtreecommitdiff
path: root/board/fizz
diff options
context:
space:
mode:
authorDaisuke Nojiri <dnojiri@chromium.org>2018-06-06 10:48:10 -0700
committerchrome-bot <chrome-bot@chromium.org>2018-06-14 01:31:53 -0700
commit2b0918db5c3c4181410bc97e98a27db20fd622d9 (patch)
treeaf80232d83b04ae6169804626bb5a47f002ab0b8 /board/fizz
parente299988d4648071d945583643bc87589d528e5b2 (diff)
downloadchrome-ec-2b0918db5c3c4181410bc97e98a27db20fd622d9.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> (cherry picked from commit 77997e8422b1ef5d511019a8a1e38fa743eab082) Reviewed-on: https://chromium-review.googlesource.com/1098716 Commit-Ready: Daisuke Nojiri <dnojiri@chromium.org> Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Diffstat (limited to 'board/fizz')
-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 9f7fe30ed8..7e4135be47 100644
--- a/board/fizz/board.c
+++ b/board/fizz/board.c
@@ -671,7 +671,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;
@@ -718,10 +720,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 81e4eabf5f..30b2ef8276 100644
--- a/board/fizz/board.h
+++ b/board/fizz/board.h
@@ -237,7 +237,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