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>

2 files changed, 26 insertions, 19 deletions

diff --git a/board/fizz/board.c b/board/fizz/board.c
index 46ff53069d..75450fd725 100644
--- a/board/fizz/board.c
+++ b/board/fizz/board.c
@@ -630,23 +630,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 */
@@ -668,9 +651,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,
@@ -718,6 +723,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;
@@ -769,8 +777,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 e01676cd05..7f2f22b2b3 100644
--- a/board/fizz/board.h
+++ b/board/fizz/board.h
@@ -240,6 +240,7 @@ enum OEM_ID {
 	OEM_WUKONG_A = 4,
 	OEM_WUKONG_M = 5,
 	OEM_BLEEMO = 6,
+	OEM_JAX = 8,
 	/* Number of OEM IDs */
 	OEM_COUNT
 };