diff options
| author | xiaoqiang.zhu <xiaoqiang.zhu@bitland.corp-partner.google.com> | 2020-04-03 19:45:21 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-04-06 15:25:47 +0000 |
| commit | d44a2e17fcc0bfc09516d2fc4e30d654b4eb1864 (patch) | |
| tree | c7dbe0f9bb8a8ef455897c8e96a9ddb8f53d5df8 | |
| parent | 97860b77bf5b5b41cf7a62f7abd83b0a50d9bb7c (diff) | |
| download | chrome-ec-d44a2e17fcc0bfc09516d2fc4e30d654b4eb1864.tar.gz | |
nuwani : Add SKU ID check for different sku board
nuwani sku id range is from 0xd0 to 0xdf, and
nuwani180 sku id is 0xd0, nuwani360 sku id is 0xd8.
BUG=b:150846518
BRANCH=firmware-grunt-11031.B
TEST=boot nuwani180/360 board, function as expected.
Signed-off-by: xiaoqiang.zhu <xiaoqiang.zhu@bitland.corp-partner.google.com>
Change-Id: I3be5df864d52415f8b471cf990ff6b50c9ad7909
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2134337
Reviewed-by: Edward Hill <ecgh@chromium.org>
Commit-Queue: Edward Hill <ecgh@chromium.org>
| -rw-r--r-- | baseboard/grunt/baseboard.c | 16 | ||||
| -rw-r--r-- | board/nuwani/board.c | 6 |
2 files changed, 14 insertions, 8 deletions
diff --git a/baseboard/grunt/baseboard.c b/baseboard/grunt/baseboard.c index a86246f65e..142b3b60ab 100644 --- a/baseboard/grunt/baseboard.c +++ b/baseboard/grunt/baseboard.c @@ -281,8 +281,11 @@ static uint32_t sku_id; static int ps8751_tune_mux(int port) { - /* Tune USB mux registers for treeya's port 1 Rx measurement */ - if ((sku_id >= 0xa0) && (sku_id <= 0xaf)) + /* Tune USB mux registers for treeya's port 1 Rx measurement. + * nuwani board same as treeya board. + */ + if (((sku_id >= 0xa0) && (sku_id <= 0xaf)) || + ((sku_id >= 0xd0) && (sku_id <= 0xdf))) mux_write(port, PS8XXX_REG_MUX_USB_C2SS_EQ, 0x40); return EC_SUCCESS; @@ -765,7 +768,8 @@ int board_is_convertible(void) /* Grunt: 6 */ /* Kasumi360: 82 */ /* Treeya360: a8-af */ - return (sku_id == 6 || sku_id == 82 || + /* Nuwani360: d8 */ + return (sku_id == 6 || sku_id == 82 || sku_id == 0xd8 || ((sku_id >= 0xa8) && (sku_id <= 0xaf))); } @@ -778,13 +782,15 @@ uint32_t board_override_feature_flags0(uint32_t flags0) { /* * Remove keyboard backlight feature for devices that don't support it. - * All Treeya and Treeya360 models do not support keyboard backlight. + * All Treeya/Nuwani and Treeya360/Nuwani360 models do not support + * keyboard backlight. */ if (sku_id == 16 || sku_id == 17 || sku_id == 20 || sku_id == 21 || sku_id == 32 || sku_id == 33 || sku_id == 40 || sku_id == 41 || - ((sku_id >= 0xa0) && (sku_id <= 0xaf))) + ((sku_id >= 0xa0) && (sku_id <= 0xaf)) || + ((sku_id >= 0xd0) && (sku_id <= 0xdf))) return (flags0 & ~EC_FEATURE_MASK_0(EC_FEATURE_PWM_KEYB)); else return flags0; diff --git a/board/nuwani/board.c b/board/nuwani/board.c index b3a4f5d484..b0d8fc50a1 100644 --- a/board/nuwani/board.c +++ b/board/nuwani/board.c @@ -146,10 +146,10 @@ struct motion_sensor_t base_gyro_1 = { static int board_use_st_sensor(void) { - /* sku_id 0xa8-0xa9 use ST sensors */ + /* Nuwani sku_id 0xd0-0xdf use ST sensors */ uint32_t sku_id = system_get_sku_id(); - return sku_id == 0xa8 || sku_id == 0xa9; + return ((sku_id >= 0xd0) && (sku_id <= 0xdf)); } /* treeya board will use two sets of lid/base sensor, we need update @@ -158,7 +158,7 @@ static int board_use_st_sensor(void) void board_update_sensor_config_from_sku(void) { if (board_is_convertible()) { - /* sku_id a8-a9 use ST sensors */ + /* Nuwani sku_id 0xd0-0xdf use ST sensors */ if (board_use_st_sensor()) { motion_sensors[LID_ACCEL] = lid_accel_1; motion_sensors[BASE_ACCEL] = base_accel_1; |