diff options
-rw-r--r-- | baseboard/zork/baseboard.c | 21 | ||||
-rw-r--r-- | baseboard/zork/baseboard.h | 6 | ||||
-rw-r--r-- | board/berknip/ec.tasklist | 1 | ||||
-rw-r--r-- | board/dalboz/ec.tasklist | 1 | ||||
-rw-r--r-- | board/dirinboz/ec.tasklist | 1 | ||||
-rw-r--r-- | board/ezkinil/ec.tasklist | 1 | ||||
-rw-r--r-- | board/morphius/ec.tasklist | 1 | ||||
-rw-r--r-- | board/trembyle/ec.tasklist | 1 | ||||
-rw-r--r-- | board/vilboz/ec.tasklist | 1 | ||||
-rw-r--r-- | board/woomax/ec.tasklist | 1 |
10 files changed, 0 insertions, 35 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; -} diff --git a/baseboard/zork/baseboard.h b/baseboard/zork/baseboard.h index 4938914e52..4e166be723 100644 --- a/baseboard/zork/baseboard.h +++ b/baseboard/zork/baseboard.h @@ -71,12 +71,6 @@ #define CONFIG_CHARGER_ISL9241 #define CONFIG_CHARGER_SENSE_RESISTOR 10 #define CONFIG_CHARGER_SENSE_RESISTOR_AC 20 -/* - * We would prefer to use CONFIG_CHARGE_RAMP_HW to enable legacy BC1.2 charging - * but that feature of ISL9241 is broken (b/160287056) so we have to use - * CONFIG_CHARGE_RAMP_SW instead. - */ -#define CONFIG_CHARGE_RAMP_SW #define CONFIG_CHIPSET_STONEY #define CONFIG_CHIPSET_CAN_THROTTLE diff --git a/board/berknip/ec.tasklist b/board/berknip/ec.tasklist index d9c1606eb2..2874dff927 100644 --- a/board/berknip/ec.tasklist +++ b/board/berknip/ec.tasklist @@ -9,7 +9,6 @@ #define CONFIG_TASK_LIST \ TASK_ALWAYS(HOOKS, hook_task, NULL, LARGER_TASK_STACK_SIZE) \ - TASK_ALWAYS(CHG_RAMP, chg_ramp_task, NULL, TASK_STACK_SIZE) \ TASK_ALWAYS(USB_CHG_P0, usb_charger_task, 0, TASK_STACK_SIZE) \ TASK_ALWAYS(USB_CHG_P1, usb_charger_task, 1, TASK_STACK_SIZE) \ TASK_ALWAYS(CHARGER, charger_task, NULL, VENTI_TASK_STACK_SIZE) \ diff --git a/board/dalboz/ec.tasklist b/board/dalboz/ec.tasklist index 41b83cf4f3..fb6e2f75a1 100644 --- a/board/dalboz/ec.tasklist +++ b/board/dalboz/ec.tasklist @@ -9,7 +9,6 @@ #define CONFIG_TASK_LIST \ TASK_ALWAYS(HOOKS, hook_task, NULL, LARGER_TASK_STACK_SIZE) \ - TASK_ALWAYS(CHG_RAMP, chg_ramp_task, NULL, TASK_STACK_SIZE) \ TASK_ALWAYS(USB_CHG_P0, usb_charger_task, 0, TASK_STACK_SIZE) \ TASK_ALWAYS(USB_CHG_P1, usb_charger_task, 1, TASK_STACK_SIZE) \ TASK_ALWAYS(CHARGER, charger_task, NULL, VENTI_TASK_STACK_SIZE) \ diff --git a/board/dirinboz/ec.tasklist b/board/dirinboz/ec.tasklist index d9c1606eb2..2874dff927 100644 --- a/board/dirinboz/ec.tasklist +++ b/board/dirinboz/ec.tasklist @@ -9,7 +9,6 @@ #define CONFIG_TASK_LIST \ TASK_ALWAYS(HOOKS, hook_task, NULL, LARGER_TASK_STACK_SIZE) \ - TASK_ALWAYS(CHG_RAMP, chg_ramp_task, NULL, TASK_STACK_SIZE) \ TASK_ALWAYS(USB_CHG_P0, usb_charger_task, 0, TASK_STACK_SIZE) \ TASK_ALWAYS(USB_CHG_P1, usb_charger_task, 1, TASK_STACK_SIZE) \ TASK_ALWAYS(CHARGER, charger_task, NULL, VENTI_TASK_STACK_SIZE) \ diff --git a/board/ezkinil/ec.tasklist b/board/ezkinil/ec.tasklist index d9c1606eb2..2874dff927 100644 --- a/board/ezkinil/ec.tasklist +++ b/board/ezkinil/ec.tasklist @@ -9,7 +9,6 @@ #define CONFIG_TASK_LIST \ TASK_ALWAYS(HOOKS, hook_task, NULL, LARGER_TASK_STACK_SIZE) \ - TASK_ALWAYS(CHG_RAMP, chg_ramp_task, NULL, TASK_STACK_SIZE) \ TASK_ALWAYS(USB_CHG_P0, usb_charger_task, 0, TASK_STACK_SIZE) \ TASK_ALWAYS(USB_CHG_P1, usb_charger_task, 1, TASK_STACK_SIZE) \ TASK_ALWAYS(CHARGER, charger_task, NULL, VENTI_TASK_STACK_SIZE) \ diff --git a/board/morphius/ec.tasklist b/board/morphius/ec.tasklist index 41b83cf4f3..fb6e2f75a1 100644 --- a/board/morphius/ec.tasklist +++ b/board/morphius/ec.tasklist @@ -9,7 +9,6 @@ #define CONFIG_TASK_LIST \ TASK_ALWAYS(HOOKS, hook_task, NULL, LARGER_TASK_STACK_SIZE) \ - TASK_ALWAYS(CHG_RAMP, chg_ramp_task, NULL, TASK_STACK_SIZE) \ TASK_ALWAYS(USB_CHG_P0, usb_charger_task, 0, TASK_STACK_SIZE) \ TASK_ALWAYS(USB_CHG_P1, usb_charger_task, 1, TASK_STACK_SIZE) \ TASK_ALWAYS(CHARGER, charger_task, NULL, VENTI_TASK_STACK_SIZE) \ diff --git a/board/trembyle/ec.tasklist b/board/trembyle/ec.tasklist index 41b83cf4f3..fb6e2f75a1 100644 --- a/board/trembyle/ec.tasklist +++ b/board/trembyle/ec.tasklist @@ -9,7 +9,6 @@ #define CONFIG_TASK_LIST \ TASK_ALWAYS(HOOKS, hook_task, NULL, LARGER_TASK_STACK_SIZE) \ - TASK_ALWAYS(CHG_RAMP, chg_ramp_task, NULL, TASK_STACK_SIZE) \ TASK_ALWAYS(USB_CHG_P0, usb_charger_task, 0, TASK_STACK_SIZE) \ TASK_ALWAYS(USB_CHG_P1, usb_charger_task, 1, TASK_STACK_SIZE) \ TASK_ALWAYS(CHARGER, charger_task, NULL, VENTI_TASK_STACK_SIZE) \ diff --git a/board/vilboz/ec.tasklist b/board/vilboz/ec.tasklist index 08801d1786..c45a43e848 100644 --- a/board/vilboz/ec.tasklist +++ b/board/vilboz/ec.tasklist @@ -9,7 +9,6 @@ #define CONFIG_TASK_LIST \ TASK_ALWAYS(HOOKS, hook_task, NULL, LARGER_TASK_STACK_SIZE) \ - TASK_ALWAYS(CHG_RAMP, chg_ramp_task, NULL, TASK_STACK_SIZE) \ TASK_ALWAYS(USB_CHG_P0, usb_charger_task, 0, TASK_STACK_SIZE) \ TASK_ALWAYS(CHARGER, charger_task, NULL, VENTI_TASK_STACK_SIZE) \ TASK_ALWAYS(MOTIONSENSE, motion_sense_task, NULL, VENTI_TASK_STACK_SIZE) \ diff --git a/board/woomax/ec.tasklist b/board/woomax/ec.tasklist index d9c1606eb2..2874dff927 100644 --- a/board/woomax/ec.tasklist +++ b/board/woomax/ec.tasklist @@ -9,7 +9,6 @@ #define CONFIG_TASK_LIST \ TASK_ALWAYS(HOOKS, hook_task, NULL, LARGER_TASK_STACK_SIZE) \ - TASK_ALWAYS(CHG_RAMP, chg_ramp_task, NULL, TASK_STACK_SIZE) \ TASK_ALWAYS(USB_CHG_P0, usb_charger_task, 0, TASK_STACK_SIZE) \ TASK_ALWAYS(USB_CHG_P1, usb_charger_task, 1, TASK_STACK_SIZE) \ TASK_ALWAYS(CHARGER, charger_task, NULL, VENTI_TASK_STACK_SIZE) \ |