ryu: remove charge ramping

The charger chip is supposed to handle this feature in hardware.
Let's disable the software version to exercise the hardware.

Signed-off-by: Vincent Palatin <vpalatin@chromium.org>

BRANCH=none
BUG=chrome-os-partner:38603
TEST=on Ryu P6, plug BC1.2 chargers through legacy A-to-C cable.

Change-Id: I074eee0621ba8d23c7ef87dd251ce8fbf86a0265
Reviewed-on: https://chromium-review.googlesource.com/269518
Reviewed-by: Alec Berg <alecaberg@chromium.org>
Commit-Queue: Vincent Palatin <vpalatin@chromium.org>
Tested-by: Vincent Palatin <vpalatin@chromium.org>

3 files changed, 0 insertions, 54 deletions

diff --git a/board/ryu/board.c b/board/ryu/board.c
index 3ee91889d7..b34d50d3db 100644
--- a/board/ryu/board.c
+++ b/board/ryu/board.c
@@ -344,9 +344,6 @@ const struct adc_t adc_channels[] = {
 	/* USB PD CC lines sensing. Converted to mV (3000mV/4096). */
 	[ADC_CC1_PD] = {"CC1_PD", 3000, 4096, 0, STM32_AIN(1)},
 	[ADC_CC2_PD] = {"CC2_PD", 3000, 4096, 0, STM32_AIN(3)},
-	/* Charger current sensing. Converted to mA. */
-	[ADC_IADP] = {"IADP",  7500, 4096, 0, STM32_AIN(8)},
-	[ADC_IBAT] = {"IBAT", 37500, 4096, 0, STM32_AIN(13)},
 };
 BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT);
 
@@ -489,52 +486,6 @@ void board_set_charge_limit(int charge_ma)
 }
 
 /**
- * Return whether ramping is allowed for given supplier
- */
-int board_is_ramp_allowed(int supplier)
-{
-	return supplier == CHARGE_SUPPLIER_BC12_DCP ||
-	       supplier == CHARGE_SUPPLIER_BC12_SDP ||
-	       supplier == CHARGE_SUPPLIER_BC12_CDP ||
-	       supplier == CHARGE_SUPPLIER_PROPRIETARY;
-}
-
-/**
- * Return the maximum allowed input current
- */
-int board_get_ramp_current_limit(int supplier, int sup_curr)
-{
-	switch (supplier) {
-	case CHARGE_SUPPLIER_BC12_DCP:
-		return 2000;
-	case CHARGE_SUPPLIER_BC12_SDP:
-		return 1000;
-	case CHARGE_SUPPLIER_BC12_CDP:
-	case CHARGE_SUPPLIER_PROPRIETARY:
-		return sup_curr;
-	default:
-		return 500;
-	}
-}
-
-/**
- * Return if board is consuming full amount of input current
- */
-int board_is_consuming_full_charge(void)
-{
-	return adc_read_channel(ADC_IADP) >= charge_current_limit -
-					     IADP_ERROR_MARGIN_MA;
-}
-
-/**
- * Return if VBUS is sagging low enough that we should stop ramping
- */
-int board_is_vbus_too_low(enum chg_ramp_vbus_state ramp_state)
-{
-	return adc_read_channel(ADC_VBUS) < VBUS_LOW_THRESHOLD_MV;
-}
-
-/*
  * Enable and disable SPI for case closed debugging.  This forces the AP into
  * reset while SPI is enabled, thus preventing contention on the SPI interface.
  */
diff --git a/board/ryu/board.h b/board/ryu/board.h
index da9aff7624..2e3b71ad30 100644
--- a/board/ryu/board.h
+++ b/board/ryu/board.h
@@ -21,8 +21,6 @@
 /* Optional features */
 #undef CONFIG_CMD_HASH
 #define CONFIG_CHARGE_MANAGER
-#define CONFIG_CHARGE_RAMP
-#define CONFIG_CMD_CHGRAMP
 #define CONFIG_FORCE_CONSOLE_RESUME
 #define CONFIG_STM_HWTIMER32
 #define CONFIG_USB_POWER_DELIVERY
@@ -148,8 +146,6 @@ enum adc_channel {
 	ADC_VBUS = 0,
 	ADC_CC1_PD,
 	ADC_CC2_PD,
-	ADC_IADP,
-	ADC_IBAT,
 	/* Number of ADC channels */
 	ADC_CH_COUNT
 };
diff --git a/board/ryu/ec.tasklist b/board/ryu/ec.tasklist
index cb9fb5adf2..4c040bd207 100644
--- a/board/ryu/ec.tasklist
+++ b/board/ryu/ec.tasklist
@@ -18,7 +18,6 @@
  */
 #define CONFIG_TASK_LIST \
 	TASK_ALWAYS(HOOKS, hook_task, NULL, LARGER_TASK_STACK_SIZE) \
-	TASK_ALWAYS(CHG_RAMP, chg_ramp_task, NULL, SMALLER_TASK_STACK_SIZE) \
 	TASK_ALWAYS(USB_CHG, usb_charger_task, NULL, SMALLER_TASK_STACK_SIZE) \
 	TASK_NOTEST(LIGHTBAR, lightbar_task, NULL, LARGER_TASK_STACK_SIZE) \
 	TASK_ALWAYS(CHARGER, charger_task, NULL, TASK_STACK_SIZE) \