diff options
| author | Denis Brockus <dbrockus@google.com> | 2020-03-19 13:34:21 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-03-20 04:39:56 +0000 |
| commit | af44b0eeefca9882ce17eb61dedd5ccf6d6d66ad (patch) | |
| tree | 4c8f206ea2a103cafba70f9f5379493cc9adb5be | |
| parent | e662ec76170f9b6b0fb9d2ec5e7e42dedd9dcaee (diff) | |
| download | chrome-ec-af44b0eeefca9882ce17eb61dedd5ccf6d6d66ad.tar.gz | |
zork: allow AutoDischargeDisconnect to be sole Discharge
Guard calls to discharge if all discharge is being
performed by AutoDischargeDisconnect
BUG=none
BRANCH=none
TEST=make buildall
Signed-off-by: Denis Brockus <dbrockus@google.com>
Change-Id: Ie584e5579ef816f13ce40604da80fafc76dc4777
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2110544
Tested-by: Denis Brockus <dbrockus@chromium.org>
Auto-Submit: Denis Brockus <dbrockus@chromium.org>
Reviewed-by: Edward Hill <ecgh@chromium.org>
Commit-Queue: Denis Brockus <dbrockus@chromium.org>
| -rw-r--r-- | baseboard/zork/usb_pd_policy.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/baseboard/zork/usb_pd_policy.c b/baseboard/zork/usb_pd_policy.c index 26cc885479..4650682ed8 100644 --- a/baseboard/zork/usb_pd_policy.c +++ b/baseboard/zork/usb_pd_policy.c @@ -37,7 +37,7 @@ void pd_power_supply_reset(int port) ppc_vbus_source_enable(port, 0); /* Enable discharge if we were previously sourcing 5V */ - if (prev_en) + if (IS_ENABLED(CONFIG_USB_PD_DISCHARGE) && prev_en) pd_set_vbus_discharge(port, 1); #ifdef CONFIG_USB_PD_MAX_SINGLE_SOURCE_CURRENT @@ -58,7 +58,8 @@ int pd_set_power_supply_ready(int port) if (rv) return rv; - pd_set_vbus_discharge(port, 0); + if (IS_ENABLED(CONFIG_USB_PD_DISCHARGE)) + pd_set_vbus_discharge(port, 0); /* Provide Vbus. */ rv = ppc_vbus_source_enable(port, 1); |