diff options
Diffstat (limited to 'baseboard')
| -rw-r--r-- | baseboard/brya/charger_bq25720.c | 7 | ||||
| -rw-r--r-- | baseboard/grunt/baseboard.c | 5 | ||||
| -rw-r--r-- | baseboard/grunt/baseboard.h | 1 | ||||
| -rw-r--r-- | baseboard/octopus/baseboard.c | 7 | ||||
| -rw-r--r-- | baseboard/octopus/baseboard.h | 4 |
5 files changed, 5 insertions, 19 deletions
diff --git a/baseboard/brya/charger_bq25720.c b/baseboard/brya/charger_bq25720.c index a4fa209246..7fabd2082e 100644 --- a/baseboard/brya/charger_bq25720.c +++ b/baseboard/brya/charger_bq25720.c @@ -81,10 +81,3 @@ int board_set_active_charge_port(int port) return EC_SUCCESS; } - -__overridable void board_set_charge_limit(int port, int supplier, int charge_ma, - int max_ma, int charge_mv) -{ - charge_set_input_current_limit( - MAX(charge_ma, CONFIG_CHARGER_INPUT_CURRENT), charge_mv); -} diff --git a/baseboard/grunt/baseboard.c b/baseboard/grunt/baseboard.c index 5fbf2823be..50db1887f1 100644 --- a/baseboard/grunt/baseboard.c +++ b/baseboard/grunt/baseboard.c @@ -467,11 +467,6 @@ int board_set_active_charge_port(int port) void board_set_charge_limit(int port, int supplier, int charge_ma, int max_ma, int charge_mv) { - /* - * Limit the input current to 95% negotiated limit, - * to account for the charger chip margin. - */ - charge_ma = charge_ma * 95 / 100; charge_set_input_current_limit( MAX(charge_ma, CONFIG_CHARGER_INPUT_CURRENT), charge_mv); } diff --git a/baseboard/grunt/baseboard.h b/baseboard/grunt/baseboard.h index 1c19c05330..b83b274d49 100644 --- a/baseboard/grunt/baseboard.h +++ b/baseboard/grunt/baseboard.h @@ -73,6 +73,7 @@ * See also b/111214767 */ #define CONFIG_CHARGER_INPUT_CURRENT 512 +#define CONFIG_CHARGER_INPUT_CURRENT_DERATE_PCT 5 #define CONFIG_CHARGER_ISL9238 #define CONFIG_CHARGER_SENSE_RESISTOR 10 #define CONFIG_CHARGER_SENSE_RESISTOR_AC 20 diff --git a/baseboard/octopus/baseboard.c b/baseboard/octopus/baseboard.c index 0f012d1352..b35bbcd67b 100644 --- a/baseboard/octopus/baseboard.c +++ b/baseboard/octopus/baseboard.c @@ -301,13 +301,6 @@ int board_set_active_charge_port(int port) void board_set_charge_limit(int port, int supplier, int charge_ma, int max_ma, int charge_mv) { - /* - * Empirically, the charger seems to draw a little more current that - * it is set to, so we reduce our limit by 5%. - */ -#if defined(CONFIG_CHARGER_BQ25710) || defined(CONFIG_CHARGER_ISL9238) - charge_ma = (charge_ma * 95) / 100; -#endif charge_set_input_current_limit( MAX(charge_ma, CONFIG_CHARGER_INPUT_CURRENT), charge_mv); } diff --git a/baseboard/octopus/baseboard.h b/baseboard/octopus/baseboard.h index 724540d0f0..8662749c98 100644 --- a/baseboard/octopus/baseboard.h +++ b/baseboard/octopus/baseboard.h @@ -125,6 +125,8 @@ */ #undef CONFIG_EXTPOWER_DEBOUNCE_MS #define CONFIG_EXTPOWER_DEBOUNCE_MS 200 +/* Charger seems to overdraw by about 5% */ +#define CONFIG_CHARGER_INPUT_CURRENT_DERATE_PCT 5 #elif defined(VARIANT_OCTOPUS_CHARGER_BQ25703) #define CONFIG_CHARGER_BQ25703 #define CONFIG_CHARGER_SENSE_RESISTOR_AC 10 @@ -133,6 +135,8 @@ */ #undef CONFIG_EXTPOWER_DEBOUNCE_MS #define CONFIG_EXTPOWER_DEBOUNCE_MS 50 +/* Charger seems to overdraw by about 5% */ +#define CONFIG_CHARGER_INPUT_CURRENT_DERATE_PCT 5 #elif defined(CONFIG_CHARGER_RUNTIME_CONFIG) #define CONFIG_CHARGER_ISL9238 #define CONFIG_CHARGER_BQ25710 |