diff options
| author | Yilun Lin <yllin@google.com> | 2019-05-29 09:53:07 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-06-12 09:35:49 +0000 |
| commit | 0fa5294778cd73d265e38f9240aaedc3898e803f (patch) | |
| tree | dce94068f34577bee1e0836172d6eab95f7aa11c | |
| parent | 3f7fa9b08875f332d2d80f4fa9096ad57491bba5 (diff) | |
| download | chrome-ec-0fa5294778cd73d265e38f9240aaedc3898e803f.tar.gz | |
kukui: Enable charger software ramping.
Most DCP chargers supply 5V/2A, and we want kukui to drain as
much power as possible for such chargers.
TEST=Plug a DCP 5V/2.1A charger and see it ramps and drains up to 1.75A,
rather than original 1.34A.
BUG=b:131284131
BRANCH=None
Change-Id: I56ff4454036dd148cce6fcfbf80222a37c68e544
Signed-off-by: Yilun Lin <yllin@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1610385
Reviewed-by: Yilun Lin <yllin@chromium.org>
Commit-Queue: Yilun Lin <yllin@chromium.org>
Tested-by: Yilun Lin <yllin@chromium.org>
| -rw-r--r-- | board/kukui/battery.c | 1 | ||||
| -rw-r--r-- | board/kukui/board.c | 19 | ||||
| -rw-r--r-- | board/kukui/board.h | 1 | ||||
| -rw-r--r-- | board/kukui/ec.tasklist | 1 |
4 files changed, 22 insertions, 0 deletions
diff --git a/board/kukui/battery.c b/board/kukui/battery.c index 10e0b8c581..6a01322b89 100644 --- a/board/kukui/battery.c +++ b/board/kukui/battery.c @@ -206,6 +206,7 @@ int charger_profile_override(struct charge_state_data *curr) break; } #endif /* CONFIG_BATTERY_MAX17055 */ + /* TODO(b:131284131): Add battery configs for krane. */ /* Limit input (=VBUS) to 5V when soc > 85% and charge current < 1A. */ if (!(curr->batt.flags & BATT_FLAG_BAD_CURRENT) && diff --git a/board/kukui/board.c b/board/kukui/board.c index 65e98ea788..6192b4481b 100644 --- a/board/kukui/board.c +++ b/board/kukui/board.c @@ -8,6 +8,7 @@ #include "backlight.h" #include "button.h" #include "charge_manager.h" +#include "charge_ramp.h" #include "charge_state.h" #include "charger.h" #include "chipset.h" @@ -504,3 +505,21 @@ int board_allow_i2c_passthru(int port) void usb_charger_set_switches(int port, enum usb_switch setting) { } + +/* + * Return if VBUS is sagging too low + */ +int board_is_vbus_too_low(int port, enum chg_ramp_vbus_state ramp_state) +{ + /* + * Though we have a more tolerant range (3.9V~13.4V), setting 4400 to + * prevent from a bad charger crashed. + * + * TODO(b:131284131): mt6370 VBUS reading is not accurate currently. + * Vendor will provide a workaround solution to fix the gap between ADC + * reading and actual voltage. After the workaround applied, we could + * try to raise this value to 4600. (when it says it read 4400, it is + * actually close to 4600) + */ + return charger_get_vbus_voltage(port) < 4400; +} diff --git a/board/kukui/board.h b/board/kukui/board.h index 053f132ff8..ca77f30852 100644 --- a/board/kukui/board.h +++ b/board/kukui/board.h @@ -64,6 +64,7 @@ #define CONFIG_VBOOT_HASH #define CONFIG_VOLUME_BUTTONS +#define CONFIG_CHARGE_RAMP_SW #define CONFIG_CHARGER #define CONFIG_CHARGER_MT6370 #define CONFIG_CHARGER_INPUT_CURRENT 512 diff --git a/board/kukui/ec.tasklist b/board/kukui/ec.tasklist index f265649f3e..3efd5101f4 100644 --- a/board/kukui/ec.tasklist +++ b/board/kukui/ec.tasklist @@ -9,6 +9,7 @@ #define CONFIG_TASK_LIST \ TASK_ALWAYS(HOOKS, hook_task, NULL, LARGER_TASK_STACK_SIZE) \ TASK_ALWAYS(CHARGER, charger_task, NULL, LARGER_TASK_STACK_SIZE) \ + TASK_ALWAYS(CHG_RAMP, chg_ramp_task, NULL, LARGER_TASK_STACK_SIZE) \ TASK_ALWAYS(USB_CHG, usb_charger_task, NULL, TASK_STACK_SIZE) \ TASK_NOTEST(CHIPSET, chipset_task, NULL, LARGER_TASK_STACK_SIZE) \ TASK_ALWAYS_RW(MOTIONSENSE, motion_sense_task, NULL, VENTI_TASK_STACK_SIZE) \ |