diff options
| author | Caveh Jalali <caveh@chromium.org> | 2021-02-17 01:23:11 -0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-03-10 20:00:31 +0000 |
| commit | aa1d507ab38889e934f4e99e814d7663588891bb (patch) | |
| tree | d7350be1e78624e03ee6a27262d4b7e2637ebed2 /board/brya | |
| parent | 632d1e77e33f7f07f1e48585e03eb35525166210 (diff) | |
| download | chrome-ec-aa1d507ab38889e934f4e99e814d7663588891bb.tar.gz | |
Brya: Enable charger chip
This adds the charger chip support code.
BRANCH=none
BUG=b:173575131,b:180784200
TEST=with reset of CQ-Depend patches, brya boots to AP
Change-Id: I1b220376cb03197e13aad65f1e79692eaf8fb1e1
Signed-off-by: Caveh Jalali <caveh@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2700316
Commit-Queue: Furquan Shaikh <furquan@chromium.org>
Tested-by: Furquan Shaikh <furquan@chromium.org>
Diffstat (limited to 'board/brya')
| -rw-r--r-- | board/brya/board.c | 44 | ||||
| -rw-r--r-- | board/brya/board.h | 7 | ||||
| -rw-r--r-- | board/brya/ec.tasklist | 2 |
3 files changed, 53 insertions, 0 deletions
diff --git a/board/brya/board.c b/board/brya/board.c index 17242a73d6..9dc52a1046 100644 --- a/board/brya/board.c +++ b/board/brya/board.c @@ -6,6 +6,9 @@ #include "common.h" #include "cbi_ec_fw_config.h" +#include "charge_ramp.h" +#include "charger.h" +#include "console.h" #include "power_button.h" #include "power.h" #include "switch.h" @@ -13,6 +16,10 @@ #include "gpio_list.h" /* Must come after other header files. */ +/* Console output macros */ +#define CPRINTF(format, args...) cprintf(CC_CHARGER, format, ## args) +#define CPRINTS(format, args...) cprints(CC_CHARGER, format, ## args) + /******************************************************************************/ /* USB-A charging control */ @@ -35,3 +42,40 @@ __override void board_cbi_init(void) { config_usb_db_type(); } + +#ifdef CONFIG_CHARGE_RAMP_SW + +/* + * TODO(b/181508008): tune this threshold + */ + +#define BC12_MIN_VOLTAGE 4400 + +/** + * Return true if VBUS is too low + */ +int board_is_vbus_too_low(int port, enum chg_ramp_vbus_state ramp_state) +{ + int voltage; + + if (charger_get_vbus_voltage(port, &voltage)) + voltage = 0; + + CPRINTS("%s: charger reports VBUS %d on port %d", __func__, + voltage, port); + + if (voltage == 0) { + CPRINTS("%s: must be disconnected", __func__); + return 1; + } + + if (voltage < BC12_MIN_VOLTAGE) { + CPRINTS("%s: lower than %d", __func__, + BC12_MIN_VOLTAGE); + return 1; + } + + return 0; +} + +#endif /* CONFIG_CHARGE_RAMP_SW */ diff --git a/board/brya/board.h b/board/brya/board.h index 486e1ab2cc..ddbaddadb2 100644 --- a/board/brya/board.h +++ b/board/brya/board.h @@ -100,6 +100,13 @@ */ /* #define CONFIG_FANS FAN_CH_COUNT */ +/* Charger defines */ +#define CONFIG_CHARGER_BQ25720 +#define CONFIG_CHARGE_RAMP_SW +#define CONFIG_CHARGER_NARROW_VDC +#define CONFIG_CHARGER_SENSE_RESISTOR 10 +#define CONFIG_CHARGER_SENSE_RESISTOR_AC 10 + #ifndef __ASSEMBLER__ #include "gpio_signal.h" /* needed by registers.h */ diff --git a/board/brya/ec.tasklist b/board/brya/ec.tasklist index dda8729741..dd4f31ffed 100644 --- a/board/brya/ec.tasklist +++ b/board/brya/ec.tasklist @@ -12,9 +12,11 @@ #define CONFIG_TASK_LIST \ TASK_ALWAYS(HOOKS, hook_task, NULL, LARGER_TASK_STACK_SIZE) \ + TASK_ALWAYS(CHG_RAMP, chg_ramp_task, NULL, TASK_STACK_SIZE) \ TASK_ALWAYS(USB_CHG_P0, usb_charger_task, 0, TASK_STACK_SIZE) \ TASK_ALWAYS(USB_CHG_P1, usb_charger_task, 0, TASK_STACK_SIZE) \ TASK_ALWAYS(USB_CHG_P2, usb_charger_task, 0, TASK_STACK_SIZE) \ + TASK_ALWAYS(CHARGER, charger_task, NULL, VENTI_TASK_STACK_SIZE) \ TASK_NOTEST(KEYPROTO, keyboard_protocol_task, NULL, TASK_STACK_SIZE) \ TASK_NOTEST(CHIPSET, chipset_task, NULL, LARGER_TASK_STACK_SIZE) \ TASK_ALWAYS(HOSTCMD, host_command_task, NULL, LARGER_TASK_STACK_SIZE) \ |