diff options
| author | Denis Brockus <dbrockus@chromium.org> | 2020-08-31 19:20:33 +0000 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-08-31 23:36:32 +0000 |
| commit | 2ca30ae8b57addcb351bd4051871d1073da65d99 (patch) | |
| tree | 3540a4541025544c456f7e0fdd804940eda12b07 /baseboard/zork/baseboard.c | |
| parent | 951e216cb1cd4f68db5a312300d1a03091ac2733 (diff) | |
| download | chrome-ec-2ca30ae8b57addcb351bd4051871d1073da65d99.tar.gz | |
Revert "zork: Enable CONFIG_CHARGE_RAMP_SW"
This reverts commit 8a768a06bc876f83427691d27b4e572418406875.
Reason for revert: The code as it stands breaks PD charging,
so no battery charging is functional when this is landed.
BUG=b:163864475,b:167257846
BRANCH=none
TEST=verify Zork PD charging works
Change-Id: I2c8b006e6add2e328840647367068449be28f7a6
Signed-off-by: Denis Brockus <dbrockus@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2386024
Reviewed-by: Edward Hill <ecgh@chromium.org>
Commit-Queue: Edward Hill <ecgh@chromium.org>
Diffstat (limited to 'baseboard/zork/baseboard.c')
| -rw-r--r-- | baseboard/zork/baseboard.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/baseboard/zork/baseboard.c b/baseboard/zork/baseboard.c index ea128356c1..4a482a42cb 100644 --- a/baseboard/zork/baseboard.c +++ b/baseboard/zork/baseboard.c @@ -10,7 +10,6 @@ #include "button.h" #include "cbi_ec_fw_config.h" #include "charge_manager.h" -#include "charge_ramp.h" #include "charge_state.h" #include "charge_state_v2.h" #include "common.h" @@ -47,13 +46,6 @@ #define SAFE_RESET_VBUS_MV 5000 -/* - * For legacy BC1.2 charging with CONFIG_CHARGE_RAMP_SW, ramp up input current - * until voltage drops to 4.5V. Don't go lower than this to be kind to the - * charger (see b/67964166). - */ -#define BC12_MIN_VOLTAGE 4500 - const enum gpio_signal hibernate_wake_pins[] = { GPIO_LID_OPEN, GPIO_AC_PRESENT, @@ -356,16 +348,3 @@ void board_pwrbtn_to_pch(int level) } gpio_set_level(GPIO_PCH_PWRBTN_L, level); } - -/** - * Return if VBUS is sagging too low - */ -int board_is_vbus_too_low(int port, enum chg_ramp_vbus_state ramp_state) -{ - int voltage; - - if (charger_get_vbus_voltage(port, &voltage)) - voltage = 0; - - return voltage < BC12_MIN_VOLTAGE; -} |