diff options
author | Eric Yilun Lin <yllin@chromium.org> | 2020-10-29 15:14:59 +0800 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2020-12-08 06:28:42 +0000 |
commit | a94624f1a2fa5c25c810fef5ef66012218ed177d (patch) | |
tree | 148c9274885b67be96931cb3439115b080ab528d | |
parent | 4761e94ef6690c47a25351d024705197674720bd (diff) | |
download | chrome-ec-a94624f1a2fa5c25c810fef5ef66012218ed177d.tar.gz |
charger: rename charger_set_input_current
charger_set_input_current was actually sets the input current limit,
so renames it to charger_set_input_current_limit.
BUG=b:171853295
TEST=make buildall
TEST=not output from `grep -r "\<charger_set_input_current\>"`
BRANCH=none
Change-Id: Icf4e99f287a7d4fc2d9560e8502e46cc07bfc085
Signed-off-by: Eric Yilun Lin <yllin@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2569083
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
-rw-r--r-- | board/atlas/board.c | 4 | ||||
-rw-r--r-- | board/casta/board.c | 10 | ||||
-rw-r--r-- | board/host/charger.c | 4 | ||||
-rw-r--r-- | common/charge_state_v2.c | 26 | ||||
-rw-r--r-- | common/charger.c | 11 | ||||
-rw-r--r-- | driver/charger/bd9995x.c | 8 | ||||
-rw-r--r-- | driver/charger/bq24715.c | 9 | ||||
-rw-r--r-- | driver/charger/bq24773.c | 6 | ||||
-rw-r--r-- | driver/charger/bq25710.c | 9 | ||||
-rw-r--r-- | driver/charger/isl923x.c | 16 | ||||
-rw-r--r-- | driver/charger/isl923x.h | 46 | ||||
-rw-r--r-- | driver/charger/isl9241.c | 9 | ||||
-rw-r--r-- | driver/charger/rt946x.c | 6 | ||||
-rw-r--r-- | driver/charger/sm5803.c | 6 | ||||
-rw-r--r-- | include/charger.h | 17 |
15 files changed, 102 insertions, 85 deletions
diff --git a/board/atlas/board.c b/board/atlas/board.c index 0ef9a591da..ac617130ab 100644 --- a/board/atlas/board.c +++ b/board/atlas/board.c @@ -529,8 +529,8 @@ static int charger_derate(int current) static void board_charger_init(void) { - charger_set_input_current(CHARGER_SOLO, charger_derate - (PD_MAX_CURRENT_MA)); + charger_set_input_current_limit(CHARGER_SOLO, + charger_derate(PD_MAX_CURRENT_MA)); } DECLARE_HOOK(HOOK_INIT, board_charger_init, HOOK_PRIO_DEFAULT); diff --git a/board/casta/board.c b/board/casta/board.c index 72e8045bc8..4942a76f62 100644 --- a/board/casta/board.c +++ b/board/casta/board.c @@ -168,13 +168,13 @@ DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_INIT_I2C); static void set_input_limit_on_ac_removal(void) { - if(extpower_is_present()) - return; + if (extpower_is_present()) + return; - if(get_cbi_ssfc_charger() != SSFC_CHARGER_BQ25710) - return; + if (get_cbi_ssfc_charger() != SSFC_CHARGER_BQ25710) + return; - charger_set_input_current(0, CONFIG_CHARGER_INPUT_CURRENT); + charger_set_input_current_limit(0, CONFIG_CHARGER_INPUT_CURRENT); } DECLARE_HOOK(HOOK_AC_CHANGE, set_input_limit_on_ac_removal, HOOK_PRIO_DEFAULT); diff --git a/board/host/charger.c b/board/host/charger.c index 01f29571d0..1128f318d3 100644 --- a/board/host/charger.c +++ b/board/host/charger.c @@ -128,7 +128,7 @@ static enum ec_error_list mock_get_input_current(int chgnum, int *input_current) } -static enum ec_error_list mock_set_input_current(int chgnum, int current) +static enum ec_error_list mock_set_input_current_limit(int chgnum, int current) { const struct charger_info *info = mock_get_info(chgnum); @@ -160,7 +160,7 @@ const struct charger_drv mock_drv = { .set_current = &mock_set_current, .get_voltage = &mock_get_voltage, .set_voltage = &mock_set_voltage, - .set_input_current = &mock_set_input_current, + .set_input_current_limit = &mock_set_input_current_limit, .get_input_current = &mock_get_input_current, .manufacturer_id = &mock_manufacturer_id, .device_id = &mock_device_id, diff --git a/common/charge_state_v2.c b/common/charge_state_v2.c index af5a996706..ecce4fbdb2 100644 --- a/common/charge_state_v2.c +++ b/common/charge_state_v2.c @@ -417,7 +417,7 @@ static void set_base_lid_current(int current_base, int allow_charge_base, ret = charge_set_output_current_limit(CHARGER_SOLO, 0, 0); if (ret) return; - ret = charger_set_input_current(chgnum, current_lid); + ret = charger_set_input_current_limit(chgnum, current_lid); if (ret) return; if (allow_charge_lid) @@ -1736,19 +1736,20 @@ void charger_task(void *u) * Try again if it fails. */ int rv = charger_post_init(); + if (rv != EC_SUCCESS) { problem(PR_POST_INIT, rv); - } else { - if (curr.desired_input_current != - CHARGE_CURRENT_UNINITIALIZED) - rv = charger_set_input_current( - chgnum, - curr.desired_input_current); + } else if (curr.desired_input_current != + CHARGE_CURRENT_UNINITIALIZED) { + rv = charger_set_input_current_limit( + chgnum, + curr.desired_input_current); if (rv != EC_SUCCESS) problem(PR_SET_INPUT_CURR, rv); - else - prev_ac = curr.ac; } + + if (rv == EC_SUCCESS) + prev_ac = curr.ac; } else { /* Some things are only meaningful on AC */ chg_ctl_mode = CHARGE_CONTROL_NORMAL; @@ -1779,7 +1780,7 @@ void charger_task(void *u) get_desired_input_current(prev_bp, info); if (curr.desired_input_current != CHARGE_CURRENT_UNINITIALIZED) - charger_set_input_current(chgnum, + charger_set_input_current_limit(chgnum, curr.desired_input_current); hook_notify(HOOK_BATTERY_SOC_CHANGE); } @@ -2491,7 +2492,7 @@ int charge_set_input_current_limit(int ma, int mv) charge_wakeup(); return EC_SUCCESS; #else - return charger_set_input_current(chgnum, ma); + return charger_set_input_current_limit(chgnum, ma); #endif } @@ -2718,7 +2719,8 @@ charge_command_charge_state(struct host_cmd_handler_args *args) chgstate_set_manual_current(val); break; case CS_PARAM_CHG_INPUT_CURRENT: - if (charger_set_input_current(chgnum, val)) + if (charger_set_input_current_limit(chgnum, + val)) rv = EC_RES_ERROR; break; case CS_PARAM_CHG_STATUS: diff --git a/common/charger.c b/common/charger.c index 4037af9854..a2bf4abbfa 100644 --- a/common/charger.c +++ b/common/charger.c @@ -211,7 +211,7 @@ static int command_charger(int argc, char **argv) d = strtoi(argv[2+idx_provided], &e, 0); if (*e) return EC_ERROR_PARAM2+idx_provided; - return charger_set_input_current(chgnum, d); + return charger_set_input_current_limit(chgnum, d); } else if (strcasecmp(argv[1+idx_provided], "current") == 0) { d = strtoi(argv[2+idx_provided], &e, 0); if (*e) @@ -474,7 +474,8 @@ enum ec_error_list charger_get_vbus_voltage(int port, int *voltage) return rv; } -enum ec_error_list charger_set_input_current(int chgnum, int input_current) +enum ec_error_list charger_set_input_current_limit(int chgnum, + int input_current) { int rv = EC_ERROR_UNIMPLEMENTED; @@ -483,9 +484,9 @@ enum ec_error_list charger_set_input_current(int chgnum, int input_current) return EC_ERROR_INVAL; } - if (chg_chips[chgnum].drv->set_input_current) - rv = chg_chips[chgnum].drv->set_input_current(chgnum, - input_current); + if (chg_chips[chgnum].drv->set_input_current_limit) + rv = chg_chips[chgnum].drv->set_input_current_limit( + chgnum, input_current); return rv; } diff --git a/driver/charger/bd9995x.c b/driver/charger/bd9995x.c index 950657f457..b38776a574 100644 --- a/driver/charger/bd9995x.c +++ b/driver/charger/bd9995x.c @@ -614,8 +614,8 @@ static int bd9995x_ramp_max(int supplier, int sup_curr) /* chip specific interfaces */ -static enum ec_error_list bd9995x_set_input_current(int chgnum, - int input_current) +static enum ec_error_list bd9995x_set_input_current_limit(int chgnum, + int input_current) { int rv; @@ -902,7 +902,7 @@ static void bd9995x_battery_charging_profile_settings(int chgnum) const struct battery_info *bi = battery_get_info(); /* Input Current Limit Setting */ - bd9995x_set_input_current(chgnum, CONFIG_CHARGER_INPUT_CURRENT); + bd9995x_set_input_current_limit(chgnum, CONFIG_CHARGER_INPUT_CURRENT); /* Charge Termination Current Setting */ ch_raw_write16(chgnum, BD9995X_CMD_ITERM_SET, 0, @@ -1731,7 +1731,7 @@ const struct charger_drv bd9995x_drv = { .set_voltage = &bd9995x_set_voltage, .discharge_on_ac = &bd9995x_discharge_on_ac, .get_vbus_voltage = &bd9995x_get_vbus_voltage, - .set_input_current = &bd9995x_set_input_current, + .set_input_current_limit = &bd9995x_set_input_current_limit, .get_input_current = &bd9995x_get_input_current, .manufacturer_id = &bd9995x_manufacturer_id, .device_id = &bd9995x_device_id, diff --git a/driver/charger/bq24715.c b/driver/charger/bq24715.c index 691d5f94fb..8c83575c65 100644 --- a/driver/charger/bq24715.c +++ b/driver/charger/bq24715.c @@ -49,8 +49,8 @@ static inline enum ec_error_list sbc_write(int chgnum, int cmd, int param) cmd, param); } -static enum ec_error_list bq24715_set_input_current(int chgnum, - int input_current) +static enum ec_error_list bq24715_set_input_current_limit(int chgnum, + int input_current) { return sbc_write(chgnum, BQ24715_INPUT_CURRENT, CURRENT_TO_REG(input_current, R_AC)); @@ -209,7 +209,8 @@ static enum ec_error_list bq24715_post_init(int chgnum) if (rv) return rv; - rv = bq24715_set_input_current(chgnum, CONFIG_CHARGER_INPUT_CURRENT); + rv = bq24715_set_input_current_limit(chgnum, + CONFIG_CHARGER_INPUT_CURRENT); return rv; } @@ -242,7 +243,7 @@ const struct charger_drv bq24715_drv = { .get_voltage = &bq24715_get_voltage, .set_voltage = &bq24715_set_voltage, .discharge_on_ac = &bq24715_discharge_on_ac, - .set_input_current = &bq24715_set_input_current, + .set_input_current_limit = &bq24715_set_input_current_limit, .get_input_current = &bq24715_get_input_current, .manufacturer_id = &bq24715_manufacturer_id, .device_id = &bq24715_device_id, diff --git a/driver/charger/bq24773.c b/driver/charger/bq24773.c index bfaac4873a..b18c678b3a 100644 --- a/driver/charger/bq24773.c +++ b/driver/charger/bq24773.c @@ -91,8 +91,8 @@ static inline enum ec_error_list raw_write16(int chgnum, int offset, int value) /* chip specific interfaces */ -static enum ec_error_list bq2477x_set_input_current(int chgnum, - int input_current) +static enum ec_error_list bq2477x_set_input_current_limit(int chgnum, + int input_current) { #ifdef CONFIG_CHARGER_BQ24770 return raw_write16(chgnum, REG_INPUT_CURRENT, @@ -308,7 +308,7 @@ const struct charger_drv bq2477x_drv = { .get_voltage = &bq2477x_get_voltage, .set_voltage = &bq2477x_set_voltage, .discharge_on_ac = &bq2477x_discharge_on_ac, - .set_input_current = &bq2477x_set_input_current, + .set_input_current_limit = &bq2477x_set_input_current_limit, .get_input_current = &bq2477x_get_input_current, .manufacturer_id = &bq2477x_manufacturer_id, .device_id = &bq2477x_device_id, diff --git a/driver/charger/bq25710.c b/driver/charger/bq25710.c index d8a406b73c..fdfacbaa35 100644 --- a/driver/charger/bq25710.c +++ b/driver/charger/bq25710.c @@ -388,8 +388,8 @@ static enum ec_error_list bq25710_discharge_on_ac(int chgnum, int enable) return bq25710_set_option(chgnum, option); } -static enum ec_error_list bq25710_set_input_current(int chgnum, - int input_current) +static enum ec_error_list bq25710_set_input_current_limit(int chgnum, + int input_current) { int num_steps = INPUT_CURRENT_TO_REG(input_current); @@ -485,7 +485,8 @@ static void bq25710_chg_ramp_handle(void) */ ramp_curr = chg_ramp_get_current_limit(); if (chg_ramp_is_stable()) { - if (ramp_curr && !charger_set_input_current(chgnum, ramp_curr)) + if (ramp_curr && + !charger_set_input_current_limit(chgnum, ramp_curr)) CPRINTF("bq25710: stable ramp current=%d\n", ramp_curr); } else { CPRINTF("bq25710: ICO stall, ramp current=%d\n", ramp_curr); @@ -668,7 +669,7 @@ const struct charger_drv bq25710_drv = { .set_voltage = &bq25710_set_voltage, .discharge_on_ac = &bq25710_discharge_on_ac, .get_vbus_voltage = &bq25710_get_vbus_voltage, - .set_input_current = &bq25710_set_input_current, + .set_input_current_limit = &bq25710_set_input_current_limit, .get_input_current = &bq25710_get_input_current, .manufacturer_id = &bq25710_manufacturer_id, .device_id = &bq25710_device_id, diff --git a/driver/charger/isl923x.c b/driver/charger/isl923x.c index e0d7f4feea..3d70ba6431 100644 --- a/driver/charger/isl923x.c +++ b/driver/charger/isl923x.c @@ -154,17 +154,17 @@ static enum ec_error_list isl9237_set_voltage(int chgnum, uint16_t voltage) /* chip specific interfaces */ -static enum ec_error_list isl923x_set_input_current(int chgnum, - int input_current) +static enum ec_error_list isl923x_set_input_current_limit(int chgnum, + int input_current) { int rv; uint16_t reg = AC_CURRENT_TO_REG(input_current); - rv = raw_write16(chgnum, ISL923X_REG_ADAPTER_CURRENT1, reg); + rv = raw_write16(chgnum, ISL923X_REG_ADAPTER_CURRENT_LIMIT1, reg); if (rv) return rv; - return raw_write16(chgnum, ISL923X_REG_ADAPTER_CURRENT2, reg); + return raw_write16(chgnum, ISL923X_REG_ADAPTER_CURRENT_LIMIT2, reg); } #ifdef CONFIG_CMD_CHARGER_ADC_AMON_BMON @@ -224,7 +224,7 @@ static enum ec_error_list isl923x_get_input_current(int chgnum, if (IS_ENABLED(CONFIG_CHARGER_RAA489000)) reg = RAA489000_REG_ADC_INPUT_CURRENT; else - reg = ISL923X_REG_ADAPTER_CURRENT1; + reg = ISL923X_REG_ADAPTER_CURRENT_LIMIT1; rv = raw_read16(chgnum, reg, ®val); if (rv) @@ -686,8 +686,8 @@ static void isl923x_init(int chgnum) /* * Initialize the input current limit to the board's default. */ - if (isl923x_set_input_current(chgnum, - CONFIG_CHARGER_INPUT_CURRENT)) + if (isl923x_set_input_current_limit( + chgnum, CONFIG_CHARGER_INPUT_CURRENT)) goto init_fail; } @@ -1281,7 +1281,7 @@ const struct charger_drv isl923x_drv = { .set_voltage = &isl923x_set_voltage, .discharge_on_ac = &isl923x_discharge_on_ac, .get_vbus_voltage = &isl923x_get_vbus_voltage, - .set_input_current = &isl923x_set_input_current, + .set_input_current_limit = &isl923x_set_input_current_limit, .get_input_current = &isl923x_get_input_current, .manufacturer_id = &isl923x_manufacturer_id, .device_id = &isl923x_device_id, diff --git a/driver/charger/isl923x.h b/driver/charger/isl923x.h index 8194cdfb7d..0ae8327ed4 100644 --- a/driver/charger/isl923x.h +++ b/driver/charger/isl923x.h @@ -12,29 +12,29 @@ #define ISL923X_ADDR_FLAGS (0x09) /* Registers */ -#define ISL923X_REG_CHG_CURRENT 0x14 -#define ISL923X_REG_ADAPTER_CURRENT1 0x3f -#define ISL923X_REG_ADAPTER_CURRENT2 0x3b -#define ISL923X_REG_SYS_VOLTAGE_MAX 0x15 -#define ISL923X_REG_SYS_VOLTAGE_MIN 0x3e -#define ISL923X_REG_PROCHOT_AC 0x47 -#define ISL923X_REG_PROCHOT_DC 0x48 -#define ISL923X_REG_T1_T2 0x38 -#define ISL923X_REG_CONTROL0 0x39 -#define ISL923X_REG_CONTROL1 0x3c -#define ISL923X_REG_CONTROL2 0x3d -#define ISL9238_REG_CONTROL3 0x4c -#define ISL9238_REG_CONTROL4 0x4e -#define ISL9238C_REG_CONTROL6 0x37 -#define ISL923X_REG_INFO 0x3a -#define ISL9238_REG_INFO2 0x4d -#define ISL923X_REG_OTG_VOLTAGE 0x49 -#define ISL923X_REG_OTG_CURRENT 0x4a -#define ISL9238_REG_INPUT_VOLTAGE 0x4b -#define ISL923X_REG_MANUFACTURER_ID 0xfe -#define ISL923X_REG_DEVICE_ID 0xff -#define RAA489000_REG_CONTROL8 0x37 -#define RAA489000_REG_CONTROL10 0x35 +#define ISL923X_REG_CHG_CURRENT 0x14 +#define ISL923X_REG_ADAPTER_CURRENT_LIMIT1 0x3f +#define ISL923X_REG_ADAPTER_CURRENT_LIMIT2 0x3b +#define ISL923X_REG_SYS_VOLTAGE_MAX 0x15 +#define ISL923X_REG_SYS_VOLTAGE_MIN 0x3e +#define ISL923X_REG_PROCHOT_AC 0x47 +#define ISL923X_REG_PROCHOT_DC 0x48 +#define ISL923X_REG_T1_T2 0x38 +#define ISL923X_REG_CONTROL0 0x39 +#define ISL923X_REG_CONTROL1 0x3c +#define ISL923X_REG_CONTROL2 0x3d +#define ISL9238_REG_CONTROL3 0x4c +#define ISL9238_REG_CONTROL4 0x4e +#define ISL9238C_REG_CONTROL6 0x37 +#define ISL923X_REG_INFO 0x3a +#define ISL9238_REG_INFO2 0x4d +#define ISL923X_REG_OTG_VOLTAGE 0x49 +#define ISL923X_REG_OTG_CURRENT 0x4a +#define ISL9238_REG_INPUT_VOLTAGE 0x4b +#define ISL923X_REG_MANUFACTURER_ID 0xfe +#define ISL923X_REG_DEVICE_ID 0xff +#define RAA489000_REG_CONTROL8 0x37 +#define RAA489000_REG_CONTROL10 0x35 /* Sense resistor default values in mOhm */ #define ISL923X_DEFAULT_SENSE_RESISTOR_AC 20 diff --git a/driver/charger/isl9241.c b/driver/charger/isl9241.c index 4fd92e6c08..57b9f918e1 100644 --- a/driver/charger/isl9241.c +++ b/driver/charger/isl9241.c @@ -89,8 +89,8 @@ static inline enum ec_error_list isl9241_update(int chgnum, int offset, /*****************************************************************************/ /* Charger interfaces */ -static enum ec_error_list isl9241_set_input_current(int chgnum, - int input_current) +static enum ec_error_list isl9241_set_input_current_limit(int chgnum, + int input_current) { int rv; uint16_t reg = AC_CURRENT_TO_REG(input_current); @@ -432,7 +432,8 @@ static void isl9241_init(int chgnum) return; /* Initialize the input current limit to the board's default. */ - if (isl9241_set_input_current(chgnum, CONFIG_CHARGER_INPUT_CURRENT)) + if (isl9241_set_input_current_limit(chgnum, + CONFIG_CHARGER_INPUT_CURRENT)) goto init_fail; return; @@ -537,7 +538,7 @@ const struct charger_drv isl9241_drv = { .set_voltage = &isl9241_set_voltage, .discharge_on_ac = &isl9241_discharge_on_ac, .get_vbus_voltage = &isl9241_get_vbus_voltage, - .set_input_current = &isl9241_set_input_current, + .set_input_current_limit = &isl9241_set_input_current_limit, .get_input_current = &isl9241_get_input_current, .manufacturer_id = &isl9241_manufacturer_id, .device_id = &isl9241_device_id, diff --git a/driver/charger/rt946x.c b/driver/charger/rt946x.c index 8586f989a0..e63a0f2338 100644 --- a/driver/charger/rt946x.c +++ b/driver/charger/rt946x.c @@ -696,8 +696,8 @@ static int rt946x_is_sourcing_otg_power(int chgnum, int port) } #endif -static enum ec_error_list rt946x_set_input_current(int chgnum, - int input_current) +static enum ec_error_list rt946x_set_input_current_limit(int chgnum, + int input_current) { uint8_t reg_iin = 0; const struct charger_info * const info = rt946x_get_info(chgnum); @@ -1895,7 +1895,7 @@ const struct charger_drv rt946x_drv = { .set_voltage = &rt946x_set_voltage, .discharge_on_ac = &rt946x_discharge_on_ac, .get_vbus_voltage = &rt946x_get_vbus_voltage, - .set_input_current = &rt946x_set_input_current, + .set_input_current_limit = &rt946x_set_input_current_limit, .get_input_current = &rt946x_get_input_current, .manufacturer_id = &rt946x_manufacturer_id, .device_id = &rt946x_device_id, diff --git a/driver/charger/sm5803.c b/driver/charger/sm5803.c index e4da424e1e..c5415eb260 100644 --- a/driver/charger/sm5803.c +++ b/driver/charger/sm5803.c @@ -1267,8 +1267,8 @@ static enum ec_error_list sm5803_get_vbus_voltage(int chgnum, int port, return rv; } -static enum ec_error_list sm5803_set_input_current(int chgnum, - int input_current) +static enum ec_error_list sm5803_set_input_current_limit(int chgnum, + int input_current) { int reg; @@ -1600,7 +1600,7 @@ const struct charger_drv sm5803_drv = { .set_voltage = &sm5803_set_voltage, .discharge_on_ac = &sm5803_discharge_on_ac, .get_vbus_voltage = &sm5803_get_vbus_voltage, - .set_input_current = &sm5803_set_input_current, + .set_input_current_limit = &sm5803_set_input_current_limit, .get_input_current = &sm5803_get_input_current, .device_id = &sm5803_get_dev_id, .get_option = &sm5803_get_option, diff --git a/include/charger.h b/include/charger.h index f097f564a9..b36538712d 100644 --- a/include/charger.h +++ b/include/charger.h @@ -92,7 +92,8 @@ struct charger_drv { int *voltage); /* Set desired input current value */ - enum ec_error_list (*set_input_current)(int chgnum, int input_current); + enum ec_error_list (*set_input_current_limit)(int chgnum, + int input_current); /* Get actual input current value */ enum ec_error_list (*get_input_current)(int chgnum, int *input_current); @@ -255,8 +256,18 @@ int charger_get_system_power(void); /* Other parameters that may be charger-specific, but are common so far. */ -/* Set desired input current value */ -enum ec_error_list charger_set_input_current(int chgnum, int input_current); +/** + * Set desired input current limit + * + * Sets the hard limit of the input current (from AC). + * + * @param chgnum charger IC index + * @param input_current The current limit in mA. + * + * @return EC_SUCCESS on success, an error otherwise. + */ +enum ec_error_list charger_set_input_current_limit(int chgnum, + int input_current); /* * Get actual input current value. |