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/coral | |
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/coral')
-rw-r--r-- | board/coral/board.c | 23 | ||||
-rw-r--r-- | board/coral/board.h | 2 |
2 files changed, 1 insertions, 24 deletions
diff --git a/board/coral/board.c b/board/coral/board.c index e8d7ad537d..a99efa85ef 100644 --- a/board/coral/board.c +++ b/board/coral/board.c @@ -672,29 +672,6 @@ void board_set_charge_limit(int port, int supplier, int charge_ma, } /** - * Return whether 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_OTHER); -} - -/** - * 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) diff --git a/board/coral/board.h b/board/coral/board.h index b5045d5a29..59d879c690 100644 --- a/board/coral/board.h +++ b/board/coral/board.h @@ -48,7 +48,7 @@ /* Charger */ #define CONFIG_CHARGE_MANAGER -#define CONFIG_CHARGE_RAMP +#define CONFIG_CHARGE_RAMP_SW #define CONFIG_CHARGE_STATE_DEBUG #define CONFIG_CHARGER #define CONFIG_CHARGER_V2 |