diff options
| author | Daisuke Nojiri <dnojiri@chromium.org> | 2018-10-30 10:59:21 -0700 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2018-11-20 19:09:20 +0000 |
| commit | 76a63d74ea282cc5ff4383543075acc9ba1125e5 (patch) | |
| tree | 7d9609cb815e0ce4e2e9ed2d48edb6e8a3da08f2 | |
| parent | e2220bb905a6dced8d3c447c242c928df2da3d36 (diff) | |
| download | chrome-ec-76a63d74ea282cc5ff4383543075acc9ba1125e5.tar.gz | |
Fizz: Add Jax support
If OEM_ID is equal to 8 (Jax), the EC works as follows:
- Set barrel jack adapter spec to (19V, 3.42A).
- Set fan_count to zero
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
BUG=b:116588924
BRANCH=none
TEST=Boot Fizz with OEM=8.
Change-Id: Id6489b65a0bb71cd56d4fcf5e2fdbacb630aa99a
Reviewed-on: https://chromium-review.googlesource.com/1308258
Commit-Ready: Daisuke Nojiri <dnojiri@chromium.org>
Tested-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-by: Jett Rink <jettrink@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/1344575
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Commit-Queue: Daisuke Nojiri <dnojiri@chromium.org>
| -rw-r--r-- | board/fizz/board.c | 44 | ||||
| -rw-r--r-- | board/fizz/board.h | 1 |
2 files changed, 26 insertions, 19 deletions
diff --git a/board/fizz/board.c b/board/fizz/board.c index 0de6ff12b7..4ed3b479b5 100644 --- a/board/fizz/board.c +++ b/board/fizz/board.c @@ -639,23 +639,6 @@ static const struct fan_step fan_table2[] = { BUILD_ASSERT(ARRAY_SIZE(fan_table1) == NUM_FAN_LEVELS); BUILD_ASSERT(ARRAY_SIZE(fan_table2) == NUM_FAN_LEVELS); -static void cbi_init(void) -{ - uint32_t val; - if (cbi_get_board_version(&val) == EC_SUCCESS && val <= UINT16_MAX) - board_version = val; - CPRINTS("Board Version: 0x%04x", board_version); - - if (cbi_get_oem_id(&val) == EC_SUCCESS && val < OEM_COUNT) - oem = val; - CPRINTS("OEM: %d", oem); - - if (cbi_get_sku_id(&val) == EC_SUCCESS && val <= UINT8_MAX) - sku = val; - CPRINTS("SKU: 0x%02x", sku); -} -DECLARE_HOOK(HOOK_INIT, cbi_init, HOOK_PRIO_INIT_I2C + 1); - static void setup_fan(void) { /* Configure Fan */ @@ -677,9 +660,31 @@ static void setup_fan(void) fans[FAN_CH_0].rpm = &fan_rpm_0; fan_table = fan_table2; break; + case OEM_JAX: + fan_set_count(0); + break; } } +static void cbi_init(void) +{ + uint32_t val; + if (cbi_get_board_version(&val) == EC_SUCCESS && val <= UINT16_MAX) + board_version = val; + CPRINTS("Board Version: 0x%04x", board_version); + + if (cbi_get_oem_id(&val) == EC_SUCCESS && val < OEM_COUNT) + oem = val; + CPRINTS("OEM: %d", oem); + + if (cbi_get_sku_id(&val) == EC_SUCCESS && val <= UINT8_MAX) + sku = val; + CPRINTS("SKU: 0x%02x", sku); + + setup_fan(); +} +DECLARE_HOOK(HOOK_INIT, cbi_init, HOOK_PRIO_INIT_I2C + 1); + /* List of BJ adapters shipped with Fizz or its variants */ enum bj_adapter { BJ_65W_19V, @@ -727,6 +732,9 @@ static void setup_bj(void) bj = (BJ_ADAPTER_90W_MASK & (1 << sku)) ? BJ_90W_19V : BJ_65W_19V; break; + case OEM_JAX: + bj = BJ_65W_19V; + break; default: bj = (BJ_ADAPTER_90W_MASK & (1 << sku)) ? BJ_90W_19P5V : BJ_65W_19P5V; @@ -778,8 +786,6 @@ DECLARE_HOOK(HOOK_INIT, board_charge_manager_init, static void board_init(void) { - setup_fan(); - /* Provide AC status to the PCH */ board_extpower(); diff --git a/board/fizz/board.h b/board/fizz/board.h index 297ab9c1d4..d27f7d7eb2 100644 --- a/board/fizz/board.h +++ b/board/fizz/board.h @@ -235,6 +235,7 @@ enum OEM_ID { OEM_WUKONG_A = 4, OEM_WUKONG_M = 5, OEM_BLEEMO = 6, + OEM_JAX = 8, /* Number of OEM IDs */ OEM_COUNT }; |