From cd5e7cbeb1cfabed3632edea0c2363e181a0e228 Mon Sep 17 00:00:00 2001 From: Edward Hill Date: Tue, 29 May 2018 10:17:51 -0600 Subject: [PATCH] grunt: Reduce USB-C source current to 1.5A Grunt and Careena hardware does not support sourcing 3A over USB-C so reduce what we advertise to 1.5A. BUG=b:78908554 BRANCH=none TEST=Grunt advertises 1.5A Source Cap on both ports Change-Id: Ifd3ddf45445ae69c5988dee4f66f21056b4b0f96 Signed-off-by: Edward Hill Reviewed-on: https://chromium-review.googlesource.com/1077096 Reviewed-by: Simon Glass Reviewed-by: Jett Rink --- baseboard/grunt/baseboard.h | 1 - baseboard/grunt/usb_pd_policy.c | 20 -------------------- 2 files changed, 21 deletions(-) diff --git a/baseboard/grunt/baseboard.h b/baseboard/grunt/baseboard.h index ae6136a202..511b39cf31 100644 --- a/baseboard/grunt/baseboard.h +++ b/baseboard/grunt/baseboard.h @@ -90,7 +90,6 @@ #define CONFIG_USB_PD_DUAL_ROLE #define CONFIG_USB_PD_DUAL_ROLE_AUTO_TOGGLE #define CONFIG_USB_PD_LOGGING -#define CONFIG_USB_PD_MAX_SINGLE_SOURCE_CURRENT TYPEC_RP_3A0 #define CONFIG_USB_PD_PORT_COUNT 2 #define CONFIG_USB_PD_TCPC_LOW_POWER #define CONFIG_USB_PD_TCPM_ANX3429 diff --git a/baseboard/grunt/usb_pd_policy.c b/baseboard/grunt/usb_pd_policy.c index 0d18aad5f1..4f5a5b5c51 100644 --- a/baseboard/grunt/usb_pd_policy.c +++ b/baseboard/grunt/usb_pd_policy.c @@ -23,15 +23,10 @@ #define PDO_FIXED_FLAGS (PDO_FIXED_DUAL_ROLE | PDO_FIXED_DATA_SWAP |\ PDO_FIXED_COMM_CAP) -/* TODO(ecgh): fill in correct source and sink capabilities */ const uint32_t pd_src_pdo[] = { PDO_FIXED(5000, 1500, PDO_FIXED_FLAGS), }; const int pd_src_pdo_cnt = ARRAY_SIZE(pd_src_pdo); -const uint32_t pd_src_pdo_max[] = { - PDO_FIXED(5000, 3000, PDO_FIXED_FLAGS), -}; -const int pd_src_pdo_max_cnt = ARRAY_SIZE(pd_src_pdo_max); const uint32_t pd_snk_pdo[] = { PDO_FIXED(5000, 500, PDO_FIXED_FLAGS), @@ -127,11 +122,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); } @@ -152,11 +142,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); @@ -168,11 +153,6 @@ void pd_transition_voltage(int idx) /* No-operation: we are always 5V */ } -void typec_set_source_current_limit(int port, int rp) -{ - ppc_set_vbus_source_current_limit(port, rp); -} - int pd_snk_is_vbus_provided(int port) { return ppc_is_vbus_present(port);