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>

4 files changed, 2 insertions, 41 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)
 {
diff --git a/common/charge_ramp.c b/common/charge_ramp.c
index c84e126140..f6942d7516 100644
--- a/common/charge_ramp.c
+++ b/common/charge_ramp.c
@@ -29,6 +29,7 @@
 /* Current ramp increment */
 #define RAMP_CURR_INCR_MA   64
 #define RAMP_CURR_DELAY     (500*MSEC)
+#define RAMP_CURR_START_MA  500
 
 /* How much to backoff the input current limit when limit has been found */
 #define RAMP_ICL_BACKOFF    (2*RAMP_CURR_INCR_MA)
@@ -101,8 +102,7 @@ void chg_ramp_charge_supplier_change(int port, int supplier, int current,
 
 	/* Set min and max input current limit based on if ramp is allowed */
 	if (board_is_ramp_allowed(active_sup)) {
-		min_icl = charge_manager_get_ramp_start_current(active_port,
-								active_sup);
+		min_icl = RAMP_CURR_START_MA;
 		max_icl = board_get_ramp_current_limit(active_sup, current);
 	} else {
 		min_icl = max_icl = current;
diff --git a/include/charge_manager.h b/include/charge_manager.h
index df69bc196a..64c8272886 100644
--- a/include/charge_manager.h
+++ b/include/charge_manager.h
@@ -194,13 +194,4 @@ void board_set_charge_limit(int port, int supplier, int charge_ma,
  */
 int board_vbus_source_enabled(int port);
 
-/**
- * Get ramp start current.
- *
- * @param port PD port.
- * @param supplier Identified CHARGE_SUPPLIER_*.
- * @return ramp start current.
- */
-int charge_manager_get_ramp_start_current(int port, int supplier);
-
 #endif /* __CROS_EC_CHARGE_MANAGER_H */
diff --git a/test/charge_ramp.c b/test/charge_ramp.c
index a300c5e04f..33db036a59 100644
--- a/test/charge_ramp.c
+++ b/test/charge_ramp.c
@@ -14,7 +14,6 @@
 #include "task.h"
 #include "test_util.h"
 #include "timer.h"
-#include "usb_charge.h"
 #include "util.h"
 
 #define TASK_EVENT_OVERCURRENT (1 << 0)
@@ -37,11 +36,6 @@ static int charge_limit_ma;
 
 /* Mock functions */
 
-int charge_manager_get_ramp_start_current(int port, int supplier)
-{
-	return USB_CHARGER_MIN_CURR_MA;
-}
-
 int board_is_ramp_allowed(int supplier)
 {
 	/* Ramp for TEST4-TEST8 */