diff options
| author | Daisuke Nojiri <dnojiri@chromium.org> | 2017-10-09 10:01:57 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2017-11-13 10:57:37 -0800 |
| commit | 20d7149b1956f9b487cfc46f6adeac137dd779c5 (patch) | |
| tree | e0e2bbf12f7d5a2e262df64961c50755adc4d4b4 /common/charge_manager.c | |
| parent | d6c836b4dacdce0f3279ac56d92e7cfd92fdf967 (diff) | |
| download | chrome-ec-20d7149b1956f9b487cfc46f6adeac137dd779c5.tar.gz | |
Fizz: Switch power source to BJ at G3/S5
This patch allows Fizz to switch the power source from a type-c
charger to a barrel jack adapter if the system is in S5.
BUG=b:38321259
BRANCH=none
TEST=Verify the following with 45W and 60W type-c chargers:
1. Boot Fizz with a type-c charger
2. Go to S5 if not already.
3. Plug in a BJ adapter. Fizz boots to S0 using BJ power.
Also verified other boot modes are not affected:
1. Auto boot on BJ insert
2. Auto boot on Type-C insert
3. Recovery boot on BJ
4. Recovery boot on Type-C
5. Stay off if it's previously S5
Change-Id: I86aa0fe6e403bcbacfe396997d897111ffcf8e74
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/706251
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Diffstat (limited to 'common/charge_manager.c')
| -rw-r--r-- | common/charge_manager.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/common/charge_manager.c b/common/charge_manager.c index a068897620..4a6808b50f 100644 --- a/common/charge_manager.c +++ b/common/charge_manager.c @@ -995,6 +995,11 @@ int charge_manager_get_charger_current(void) return charge_current; } +int charge_manager_get_charger_voltage(void) +{ + return charge_voltage; +} + int charge_manager_get_power_limit_uw(void) { int current_ma = charge_current; |