diff options
| author | Vijay Hiremath <vijay.p.hiremath@intel.com> | 2017-01-18 11:08:21 -0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2017-01-18 19:18:31 -0800 |
| commit | 5909f4ee26a21de6a8683c81f24ac01daae5326a (patch) | |
| tree | 491ca6e1a649dda6675cbf551e17185b18074996 /common/charge_manager.c | |
| parent | f7720d580d007b3f3204fac97e39058c0c635687 (diff) | |
| download | chrome-ec-5909f4ee26a21de6a8683c81f24ac01daae5326a.tar.gz | |
Revert "charge_ramp: Adjust minimum ramp current"
From the USBC spec 1.2 "Table 4-14 Precedence of power source usage"
USB Type-C 3.0 A & 1.5 A takes precedence over BC1.2. Hence reverting
this patch.
This reverts commit 6a7e4a7b353c53d33d44662c71763490ffd1fdc4.
BUG=chrome-os-partner:61420
BRANCH=none
TEST=make buildall -j
Change-Id: I2ed3f767973ff9c47fa7d2a2cca1aca15d13aa65
Signed-off-by: Vijay Hiremath <vijay.p.hiremath@intel.com>
Reviewed-on: https://chromium-review.googlesource.com/430152
Commit-Ready: Vijay P Hiremath <vijay.p.hiremath@intel.com>
Tested-by: Vijay P Hiremath <vijay.p.hiremath@intel.com>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Benson Leung <bleung@chromium.org>
Diffstat (limited to 'common/charge_manager.c')
| -rw-r--r-- | common/charge_manager.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/common/charge_manager.c b/common/charge_manager.c index c0c5eded5e..1c9bac377e 100644 --- a/common/charge_manager.c +++ b/common/charge_manager.c @@ -16,7 +16,6 @@ #include "system.h" #include "tcpm.h" #include "timer.h" -#include "usb_charge.h" #include "usb_pd.h" #include "usb_pd_tcpm.h" #include "util.h" @@ -907,29 +906,6 @@ int charge_manager_get_power_limit_uw(void) return current_ma * voltage_mv; } -#ifdef HAS_TASK_CHG_RAMP -int charge_manager_get_ramp_start_current(int port, int supplier) -{ - /* - * A valid charge port is always detected as VBUS supplier type, - * 'USB charger' can detect the same port as BC1.2 DCP supplier type - * & also 'TCPC' can detect the same port as TYPEC supplier type. Thus - * a valid port is detected as 2 or 3 supplier types. Depending on the - * supplier's priority and the power that the supplier can provide, - * charge manager choses the charge supplier type of the port. - * - * If the USB charger detected supplier is BC1.2 DCP and the TCPC - * detected supplier is TYPEC then the supplier can provide stable - * current from TYPEC supplier's advertised current hence start - * ramping from TYPEC supplier's advertised current. - */ - return (supplier == CHARGE_SUPPLIER_BC12_DCP && - available_charge[CHARGE_SUPPLIER_TYPEC][port].current) ? - available_charge[CHARGE_SUPPLIER_TYPEC][port].current : - USB_CHARGER_MIN_CURR_MA; -} -#endif - #ifdef CONFIG_USB_PD_MAX_SINGLE_SOURCE_CURRENT void charge_manager_source_port(int port, int enable) { |