diff options
| author | Diana Z <dzigterman@chromium.org> | 2020-12-16 23:29:04 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-12-24 01:11:02 +0000 |
| commit | fca75f573ff913a5be050c7a13e7dcda6be68da2 (patch) | |
| tree | dc192d0343545550a4f88df2d91f813d58d27d1a /baseboard/octopus | |
| parent | c9cc5600573a6a28bd0a66d43916e969bd403bbd (diff) | |
| download | chrome-ec-fca75f573ff913a5be050c7a13e7dcda6be68da2.tar.gz | |
TCPMv2: Update source-out configs
Now that the DPM will be handling source-out decisions for TCPMv2,
remove references to its old configuration options from TCPMv2 boards in
order to avoid any confusion as to what code is running now. Also
remove the charge manager notifications of sink attach/detach since the
policy is being centralized into the DPM.
Note that the previous configuration options only ever allocated one 3.0
A port, and so the default number of 3.0 A ports has been set to 1.
BRANCH=None
BUG=b:168862110,b:141690755
TEST=make -j buildall
Signed-off-by: Diana Z <dzigterman@chromium.org>
Change-Id: Ie452e3da32b04226503539daa67b6b9f4a58aa58
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2597431
Reviewed-by: Keith Short <keithshort@chromium.org>
Diffstat (limited to 'baseboard/octopus')
| -rw-r--r-- | baseboard/octopus/baseboard.h | 1 | ||||
| -rw-r--r-- | baseboard/octopus/usb_pd_policy.c | 10 |
2 files changed, 1 insertions, 10 deletions
diff --git a/baseboard/octopus/baseboard.h b/baseboard/octopus/baseboard.h index a20b7bc8de..1f64338e25 100644 --- a/baseboard/octopus/baseboard.h +++ b/baseboard/octopus/baseboard.h @@ -200,6 +200,7 @@ #define CONFIG_USB_PD_DECODE_SOP #define CONFIG_USB_POWER_DELIVERY #define CONFIG_USB_PD_TCPMV2 +#define CONFIG_USB_PD_3A_PORTS 0 #define CONFIG_USB_PD_PORT_MAX_COUNT 2 #define CONFIG_USB_PD_DUAL_ROLE #define CONFIG_USB_PD_LOGGING diff --git a/baseboard/octopus/usb_pd_policy.c b/baseboard/octopus/usb_pd_policy.c index dcd7b41ee1..3dd6ad29f5 100644 --- a/baseboard/octopus/usb_pd_policy.c +++ b/baseboard/octopus/usb_pd_policy.c @@ -39,11 +39,6 @@ void pd_power_supply_reset(int port) if (prev_en) pd_set_vbus_discharge(port, 1); -#ifdef CONFIG_USB_PD_MAX_SINGLE_SOURCE_CURRENT - /* Give back the current quota we are no longer using */ - charge_manager_source_port(port, 0); -#endif /* defined(CONFIG_USB_PD_MAX_SINGLE_SOURCE_CURRENT) */ - /* Notify host of power info change. */ pd_send_host_event(PD_EVENT_POWER_CHANGE); } @@ -64,11 +59,6 @@ int pd_set_power_supply_ready(int port) if (rv) return rv; -#ifdef CONFIG_USB_PD_MAX_SINGLE_SOURCE_CURRENT - /* Ensure we advertise the proper available current quota */ - charge_manager_source_port(port, 1); -#endif /* defined(CONFIG_USB_PD_MAX_SINGLE_SOURCE_CURRENT) */ - /* Notify host of power info change. */ pd_send_host_event(PD_EVENT_POWER_CHANGE); |