diff options
| -rw-r--r-- | common/charge_state_v2.c | 18 | ||||
| -rw-r--r-- | common/charger_base.c | 1 |
2 files changed, 11 insertions, 8 deletions
diff --git a/common/charge_state_v2.c b/common/charge_state_v2.c index 473f684262..bee2872962 100644 --- a/common/charge_state_v2.c +++ b/common/charge_state_v2.c @@ -1109,7 +1109,6 @@ static void charger_setup(const struct charger_info *info) charger_base_setup(); #ifdef CONFIG_EC_EC_COMM_BATTERY_CLIENT curr.input_voltage = CHARGE_VOLTAGE_UNINITIALIZED; - battery_dynamic[BATT_IDX_BASE].flags = EC_BATT_FLAG_INVALID_DATA; #endif #ifdef CONFIG_OCPC ocpc_init(&curr.ocpc); @@ -1933,13 +1932,16 @@ int charge_set_input_current_limit(int ma, int mv) } curr.desired_input_current = ma; -#ifdef CONFIG_EC_EC_COMM_BATTERY_CLIENT - /* Wake up charger task to allocate current between lid and base. */ - charge_wakeup(); - return EC_SUCCESS; -#else - return charger_set_input_current_limit(chgnum, ma); -#endif + if (IS_ENABLED(CONFIG_EC_EC_COMM_BATTERY_CLIENT)) { + /* + * Wake up charger task to allocate current between lid and + * base. + */ + charge_wakeup(); + return EC_SUCCESS; + } else { + return charger_set_input_current_limit(chgnum, ma); + } } #ifdef CONFIG_OCPC diff --git a/common/charger_base.c b/common/charger_base.c index 03b7f2b461..f4f61ab97f 100644 --- a/common/charger_base.c +++ b/common/charger_base.c @@ -646,6 +646,7 @@ void charger_base_setup(void) { base_responsive = 0; charge_base = -1; + battery_dynamic[BATT_IDX_BASE].flags = EC_BATT_FLAG_INVALID_DATA; } bool charger_base_charge_changed(void) |