diff options
| author | Shawn Nematbakhsh <shawnn@chromium.org> | 2015-08-14 15:28:20 -0700 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-08-19 01:50:21 +0000 |
| commit | 4d382ad6401cbe178fa9c53309bdc8a460cf3413 (patch) | |
| tree | 30822cab382bbba385db6a1891d5df3daa060613 /common/usb_pd_policy.c | |
| parent | aa14b36f1890e373424463afc584659b2834dce6 (diff) | |
| download | chrome-ec-4d382ad6401cbe178fa9c53309bdc8a460cf3413.tar.gz | |
charge_manager: Support multiple independent charge ceilings
We will soon have a need to independently set a charge ceiling from both
the PD state machine and from incoming host commands. Store these
ceilings separately, and have the minimum take effect.
BUG=chrome-os-partner:43285
TEST=Pass unit tests. Also, host command current limit takes effect with
subsequent commit.
BRANCH=None
Change-Id: I0ecfe888a7df0d5da5a68999c164c7c841da348b
Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/293818
Reviewed-by: Alec Berg <alecaberg@chromium.org>
Diffstat (limited to 'common/usb_pd_policy.c')
| -rw-r--r-- | common/usb_pd_policy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/usb_pd_policy.c b/common/usb_pd_policy.c index 2606ca651f..16a9fefa7a 100644 --- a/common/usb_pd_policy.c +++ b/common/usb_pd_policy.c @@ -161,7 +161,7 @@ void pd_process_source_cap(int port, int cnt, uint32_t *src_caps) pd_extract_pdo_power(src_caps[pdo_index], &ma, &mv); /* Set max. limit, but apply 500mA ceiling */ - charge_manager_set_ceil(port, PD_MIN_MA); + charge_manager_set_ceil(port, CEIL_REQUESTOR_PD, PD_MIN_MA); pd_set_input_current_limit(port, ma, mv); #endif } |