diff options
Diffstat (limited to 'common/charger.c')
| -rw-r--r-- | common/charger.c | 97 |
1 files changed, 66 insertions, 31 deletions
diff --git a/common/charger.c b/common/charger.c index 8dae2e71e8..c19dd85832 100644 --- a/common/charger.c +++ b/common/charger.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * @@ -18,7 +18,7 @@ /* Console output macros */ #define CPUTS(outstr) cputs(CC_CHARGER, outstr) -#define CPRINTS(format, args...) cprints(CC_CHARGER, format, ## args) +#define CPRINTS(format, args...) cprints(CC_CHARGER, format, ##args) /* DPTF current limit, -1 = none */ static int dptf_limit_ma = -1; @@ -71,7 +71,7 @@ int charger_closest_voltage(int voltage) int charger_closest_current(int current) { - const struct charger_info * const info = charger_get_info(); + const struct charger_info *const info = charger_get_info(); /* Apply DPTF limit if necessary */ if (dptf_limit_ma >= 0 && current > dptf_limit_ma) @@ -146,7 +146,7 @@ void print_charger_debug(int chgnum) /* option */ print_item_name("Option:"); if (check_print_error(charger_get_option(&d))) - ccprintf("%pb (0x%04x)\n", BINARY_VALUE(d, 16), d); + ccprintf("(0x%04x)\n", d); /* manufacturer id */ print_item_name("Man id:"); @@ -184,7 +184,7 @@ void print_charger_debug(int chgnum) ccputs("disabled\n"); } -static int command_charger(int argc, char **argv) +static int command_charger(int argc, const char **argv) { int d; char *e; @@ -210,41 +210,43 @@ static int command_charger(int argc, char **argv) return EC_SUCCESS; } - if (strcasecmp(argv[1+idx_provided], "input") == 0) { - d = strtoi(argv[2+idx_provided], &e, 0); + if (strcasecmp(argv[1 + idx_provided], "input") == 0) { + d = strtoi(argv[2 + idx_provided], &e, 0); if (*e) - return EC_ERROR_PARAM2+idx_provided; + return EC_ERROR_PARAM2 + idx_provided; 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); + } else if (IS_ENABLED(CONFIG_BATTERY) && + strcasecmp(argv[1 + idx_provided], "current") == 0) { + d = strtoi(argv[2 + idx_provided], &e, 0); if (*e) - return EC_ERROR_PARAM2+idx_provided; + return EC_ERROR_PARAM2 + idx_provided; chgstate_set_manual_current(d); return charger_set_current(chgnum, d); - } else if (strcasecmp(argv[1+idx_provided], "voltage") == 0) { - d = strtoi(argv[2+idx_provided], &e, 0); + } else if (IS_ENABLED(CONFIG_BATTERY) && + strcasecmp(argv[1 + idx_provided], "voltage") == 0) { + d = strtoi(argv[2 + idx_provided], &e, 0); if (*e) - return EC_ERROR_PARAM2+idx_provided; + return EC_ERROR_PARAM2 + idx_provided; chgstate_set_manual_voltage(d); return charger_set_voltage(chgnum, d); - } else if (strcasecmp(argv[1+idx_provided], "dptf") == 0) { - d = strtoi(argv[2+idx_provided], &e, 0); + } else if (strcasecmp(argv[1 + idx_provided], "dptf") == 0) { + d = strtoi(argv[2 + idx_provided], &e, 0); if (*e) - return EC_ERROR_PARAM2+idx_provided; + return EC_ERROR_PARAM2 + idx_provided; dptf_limit_ma = d; return EC_SUCCESS; - } else if (strcasecmp(argv[1+idx_provided], "dump") == 0) { + } else if (strcasecmp(argv[1 + idx_provided], "dump") == 0) { if (!IS_ENABLED(CONFIG_CMD_CHARGER_DUMP) || - !chg_chips[chgnum].drv->dump_registers) { + !chg_chips[chgnum].drv->dump_registers) { ccprintf("dump not supported\n"); - return EC_ERROR_PARAM1+idx_provided; + return EC_ERROR_PARAM1 + idx_provided; } ccprintf("Dump %s registers\n", - chg_chips[chgnum].drv->get_info(chgnum)->name); + chg_chips[chgnum].drv->get_info(chgnum)->name); chg_chips[chgnum].drv->dump_registers(chgnum); return EC_SUCCESS; } else { - return EC_ERROR_PARAM1+idx_provided; + return EC_ERROR_PARAM1 + idx_provided; } } @@ -500,7 +502,7 @@ enum ec_error_list charger_enable_bypass_mode(int chgnum, int enable) return chg_chips[chgnum].drv->enable_bypass_mode(chgnum, enable); } -enum ec_error_list charger_get_vbus_voltage(int port, int *voltage) +static int charger_get_valid_chgnum(int port) { int chgnum = 0; @@ -510,15 +512,38 @@ enum ec_error_list charger_get_vbus_voltage(int port, int *voltage) if ((chgnum < 0) || (chgnum >= board_get_charger_chip_count())) { CPRINTS("%s(%d) Invalid charger!", __func__, chgnum); - return 0; + return -1; } + return chgnum; +} + +enum ec_error_list charger_get_vbus_voltage(int port, int *voltage) +{ + int chgnum = charger_get_valid_chgnum(port); + + if (chgnum < 0) + return EC_ERROR_INVAL; + if (!chg_chips[chgnum].drv->get_vbus_voltage) return EC_ERROR_UNIMPLEMENTED; return chg_chips[chgnum].drv->get_vbus_voltage(chgnum, port, voltage); } +enum ec_error_list charger_get_vsys_voltage(int port, int *voltage) +{ + int chgnum = charger_get_valid_chgnum(port); + + if (chgnum < 0) + return EC_ERROR_INVAL; + + if (!chg_chips[chgnum].drv->get_vsys_voltage) + return EC_ERROR_UNIMPLEMENTED; + + return chg_chips[chgnum].drv->get_vsys_voltage(chgnum, port, voltage); +} + enum ec_error_list charger_set_input_current_limit(int chgnum, int input_current) { @@ -644,12 +669,16 @@ enum ec_error_list charger_set_hw_ramp(int enable) if (enable) { /* Check if this is the active chg chip. */ if (chgnum == charge_get_active_chg_chip()) - rv = chg_chips[chgnum].drv->set_hw_ramp(chgnum, 1); - /* This is not the active chg chip, disable hw_ramp. */ + rv = chg_chips[chgnum].drv->set_hw_ramp( + chgnum, 1); + /* This is not the active chg chip, disable + * hw_ramp. */ else - rv = chg_chips[chgnum].drv->set_hw_ramp(chgnum, 0); + rv = chg_chips[chgnum].drv->set_hw_ramp( + chgnum, 0); } else - rv = chg_chips[chgnum].drv->set_hw_ramp(chgnum, 0); + rv = chg_chips[chgnum].drv->set_hw_ramp(chgnum, + 0); } } @@ -705,8 +734,7 @@ int chg_ramp_get_current_limit(void) enum ec_error_list charger_set_vsys_compensation(int chgnum, struct ocpc_data *ocpc, - int current_ma, - int voltage_mv) + int current_ma, int voltage_mv) { if ((chgnum < 0) || (chgnum >= board_get_charger_chip_count())) { CPRINTS("%s(%d) Invalid charger!", __func__, chgnum); @@ -726,7 +754,7 @@ enum ec_error_list charger_set_vsys_compensation(int chgnum, enum ec_error_list charger_is_icl_reached(int chgnum, bool *reached) { - if ((chgnum < 0) || (chgnum >= board_get_charger_chip_count())) { + if ((chgnum < 0) || (chgnum >= board_get_charger_chip_count())) { CPRINTS("%s(%d) Invalid charger!", __func__, chgnum); return EC_ERROR_INVAL; } @@ -750,3 +778,10 @@ enum ec_error_list charger_enable_linear_charge(int chgnum, bool enable) return EC_ERROR_UNIMPLEMENTED; } + +#ifdef CONFIG_CHARGER_MIN_BAT_PCT_FOR_POWER_ON +inline int charger_get_min_bat_pct_for_power_on(void) +{ + return CONFIG_CHARGER_MIN_BAT_PCT_FOR_POWER_ON; +} +#endif |