diff options
| author | Alec Berg <alecaberg@chromium.org> | 2014-08-04 17:52:53 -0700 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-08-09 00:20:06 +0000 |
| commit | 0815df9cbf1104a2c7fabdd4197358d54cdc8922 (patch) | |
| tree | c0f1d79fd3e24eb6b4d10741e34565879baff3f1 /common/host_command_pd.c | |
| parent | 566de98ca6b0d6a579a2dae84ecaac40c703abf7 (diff) | |
| download | chrome-ec-0815df9cbf1104a2c7fabdd4197358d54cdc8922.tar.gz | |
samus: ryu: set input current limit based on PD negotiation
Set input current limit based on the max current from the
PD negotiation. For samus, this information is passed to
the EC as a host command. For ryu, the max current is set
directly following a negotiation.
CONFIG_CHARGER_INPUT_CURRENT is now just the default limit,
but after a successful PD negotiation, the limit can be
raised.
Note, for now the input current limit for samus is set to
2/3 of the value negotiated for. This is due to hardware
problems measuring input current on p2b boards.
BUG=chrome-os-partner:28532, chrome-os-partner:24461
BRANCH=none
TEST=tested on a samus. Verified input current limit using
"charger" console command from EC. Input current limit
after a reboot is 512. When zinger is plugged in, it jumps
to the appropriate value (currently 1280mA), and when
the negotiation is changed using the "pd 0 dev 5" command
on the PD console, the input current limit is adjusted to
match (2000mA).
Change-Id: Iab9186a0f9814655e3240217a9baf4a38f15f84d
Signed-off-by: Alec Berg <alecaberg@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/211023
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Diffstat (limited to 'common/host_command_pd.c')
| -rw-r--r-- | common/host_command_pd.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/common/host_command_pd.c b/common/host_command_pd.c index 2f27e00d3d..1216d28ae3 100644 --- a/common/host_command_pd.c +++ b/common/host_command_pd.c @@ -44,8 +44,23 @@ static void pd_exchange_status(void) task_wait_event(500*MSEC); } - if (rv < 0) + if (rv < 0) { CPRINTS("Host command to PD MCU failed"); + return; + } + + /* Set input current limit */ +#ifdef BOARD_SAMUS + /* + * TODO(crosbug.com/p/28532): Remove this workaround for Samus p2b + * boards which cannot correctly limit input current. + */ + pd_status.curr_lim_ma = pd_status.curr_lim_ma * 2 / 3; +#endif + rv = charger_set_input_current(MAX(pd_status.curr_lim_ma, + CONFIG_CHARGER_INPUT_CURRENT)); + if (rv < 0) + CPRINTS("Failed to set input current limit from PD MCU"); } void pd_command_task(void) |