diff options
| author | Shawn Nematbakhsh <shawnn@chromium.org> | 2017-10-05 09:50:08 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2017-10-06 13:47:12 -0700 |
| commit | b87fe062eca43fc00909098e716581bf2aeea7eb (patch) | |
| tree | 890225b40bf562456984424adc1f243fb06ae7eb /board/kevin | |
| parent | 02045eb040227250689caec9b9401c2cd3861363 (diff) | |
| download | chrome-ec-b87fe062eca43fc00909098e716581bf2aeea7eb.tar.gz | |
charge_ramp: Move ramp allowed / ilim callbacks to common code
The decision on whether to ramp (and how high) depends on the quirks of
charger identification, so move the decision out of board, into the
drivers that implement usb_charger.
Also, rename CONFIG_CHARGE_RAMP to CONFIG_CHARGE_RAMP_SW, to better
contrast with the existing CONFIG_CHARGE_RAMP_HW.
BUG=None
TEST=Manual on kevin, verify ramp occurs when port plugged into Z840
workstation.
BRANCH=None
Change-Id: I5b395274133837a18a4f4ac34b59b623287be175
Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/702681
Commit-Ready: Shawn N <shawnn@chromium.org>
Tested-by: Shawn N <shawnn@chromium.org>
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Diffstat (limited to 'board/kevin')
| -rw-r--r-- | board/kevin/board.h | 2 | ||||
| -rw-r--r-- | board/kevin/charge_ramp.c | 23 |
2 files changed, 1 insertions, 24 deletions
diff --git a/board/kevin/board.h b/board/kevin/board.h index 1f49105386..2f09c682ee 100644 --- a/board/kevin/board.h +++ b/board/kevin/board.h @@ -117,7 +117,7 @@ /* USB PD config */ #define CONFIG_CASE_CLOSED_DEBUG_EXTERNAL #define CONFIG_CHARGE_MANAGER -#define CONFIG_CHARGE_RAMP +#define CONFIG_CHARGE_RAMP_SW #define CONFIG_USB_POWER_DELIVERY #define CONFIG_USB_PD_ALT_MODE #define CONFIG_USB_PD_ALT_MODE_DFP diff --git a/board/kevin/charge_ramp.c b/board/kevin/charge_ramp.c index 566caa6e10..350c58924b 100644 --- a/board/kevin/charge_ramp.c +++ b/board/kevin/charge_ramp.c @@ -14,21 +14,6 @@ #include "system.h" /** - * Return true if ramping is allowed for given supplier - */ -int board_is_ramp_allowed(int supplier) -{ - /* Don't allow ramping in RO when write protected */ - if (!system_is_in_rw() && system_is_locked()) - return 0; - else - return supplier == CHARGE_SUPPLIER_BC12_DCP || - supplier == CHARGE_SUPPLIER_BC12_SDP || - supplier == CHARGE_SUPPLIER_BC12_CDP || - supplier == CHARGE_SUPPLIER_PROPRIETARY; -} - -/** * Return true if VBUS is sagging too low */ int board_is_vbus_too_low(int port, enum chg_ramp_vbus_state ramp_state) @@ -37,14 +22,6 @@ int board_is_vbus_too_low(int port, enum chg_ramp_vbus_state ramp_state) } /** - * Return the maximum allowed input current - */ -int board_get_ramp_current_limit(int supplier, int sup_curr) -{ - return bd9995x_get_bc12_ilim(supplier); -} - -/** * Return if board is consuming full amount of input current */ int board_is_consuming_full_charge(void) |