From 2b0918db5c3c4181410bc97e98a27db20fd622d9 Mon Sep 17 00:00:00 2001 From: Daisuke Nojiri Date: Wed, 6 Jun 2018 10:48:10 -0700 Subject: Fizz: Add Wukong for BJ configuration Signed-off-by: Daisuke Nojiri BUG=b:71524814 BRANCH=none TEST=None Change-Id: I70deadb6f8c01c36d13f186e95244dc7a317fcbb Reviewed-on: https://chromium-review.googlesource.com/1090326 Reviewed-by: Vincent Palatin Tested-by: Daisuke Nojiri Commit-Queue: Daisuke Nojiri (cherry picked from commit 77997e8422b1ef5d511019a8a1e38fa743eab082) Reviewed-on: https://chromium-review.googlesource.com/1098716 Commit-Ready: Daisuke Nojiri Reviewed-by: Daisuke Nojiri --- board/fizz/board.c | 10 ++++++---- board/fizz/board.h | 4 +++- 2 files changed, 9 insertions(+), 5 deletions(-) (limited to 'board/fizz') 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 -- cgit v1.2.1