summaryrefslogtreecommitdiff
path: root/board/puff/board.h
diff options
context:
space:
mode:
authorAndrew McRae <amcrae@google.com>2020-06-11 14:16:50 +1000
committerCommit Bot <commit-bot@chromium.org>2020-06-11 11:31:42 +0000
commite6c9581b499e265fb6dcbe7aacd56e0270f51d8c (patch)
tree35194d2c105b80d269f904a8cc88deb42c3c4c39 /board/puff/board.h
parent6ba72e77e41ad4f5aa127ac9f21a0069ecc150ac (diff)
downloadchrome-ec-e6c9581b499e265fb6dcbe7aacd56e0270f51d8c.tar.gz
Puff: Expand BJ field in fw_config to 4 bits
To allow for up to 16 barreljack ratings, expand the fw_config barreljack field to 4 bits. This is backwards compatible with the existing fw_config allocation. BUG=b:158716456 TEST=Confirm correct power adapter parameters are selected. BRANCH=none Signed-off-by: Andrew McRae <amcrae@google.com> Change-Id: If7470b88233c12be81ff1200ec4d1c1af550f3e2 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2237452 Tested-by: Andrew McRae <amcrae@chromium.org> Commit-Queue: Peter Marheine <pmarheine@chromium.org> Reviewed-by: Peter Marheine <pmarheine@chromium.org>
Diffstat (limited to 'board/puff/board.h')
-rw-r--r--board/puff/board.h10
1 files changed, 3 insertions, 7 deletions
diff --git a/board/puff/board.h b/board/puff/board.h
index e639efaa57..83cbd5dca6 100644
--- a/board/puff/board.h
+++ b/board/puff/board.h
@@ -233,17 +233,13 @@ void led_alert(int enable);
void show_critical_error(void);
/*
- * Barrel-jack power (1 bit)
+ * Barrel-jack power (4 bits).
*/
-enum ec_cfg_bj_power_type {
- BJ_POWER_65W = 0,
- BJ_POWER_90W = 1,
-};
#define EC_CFG_BJ_POWER_L 0
-#define EC_CFG_BJ_POWER_H 0
+#define EC_CFG_BJ_POWER_H 3
#define EC_CFG_BJ_POWER_MASK GENMASK(EC_CFG_BJ_POWER_H, EC_CFG_BJ_POWER_L)
-enum ec_cfg_bj_power_type ec_config_get_bj_power(void);
+unsigned int ec_config_get_bj_power(void);
#endif /* !__ASSEMBLER__ */