diff options
| author | YongBeum.Ha <ybha@samsung.corp-partner.google.com> | 2020-09-25 15:02:15 +0900 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-11-17 01:32:05 +0000 |
| commit | 6c7aba446c0116ec91d586b3ccbe96070be08b44 (patch) | |
| tree | ee77a2a14de416b00ab98d105ef4a93409deb1ef /baseboard/octopus | |
| parent | 1d2202cd0e5b1d73170cdf4d3e07ddcc73b739d1 (diff) | |
| download | chrome-ec-6c7aba446c0116ec91d586b3ccbe96070be08b44.tar.gz | |
Casta : Support Multi-Charger
Casta needs to support 2 chargers(ISL9238 & BQ25710)
BUG=b:168122776
BRANCH=firmware-octopus-11297.B
TEST=None
Signed-off-by: YongBeum.Ha <ybha@samsung.corp-partner.google.com>
Change-Id: I18758acbd0920132c2958bf9d238b4eac3fb5b73
Signed-off-by: YongBeum.Ha <ybha@samsung.corp-partner.google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2428354
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Commit-Queue: Daisuke Nojiri <dnojiri@chromium.org>
Diffstat (limited to 'baseboard/octopus')
| -rw-r--r-- | baseboard/octopus/baseboard.c | 2 | ||||
| -rw-r--r-- | baseboard/octopus/baseboard.h | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/baseboard/octopus/baseboard.c b/baseboard/octopus/baseboard.c index 105a3bf71c..a096825c0c 100644 --- a/baseboard/octopus/baseboard.c +++ b/baseboard/octopus/baseboard.c @@ -306,7 +306,7 @@ void board_set_charge_limit(int port, int supplier, int charge_ma, * Empirically, the charger seems to draw a little more current that * it is set to, so we reduce our limit by 5%. */ -#ifdef VARIANT_OCTOPUS_CHARGER_ISL9238 +#if defined(CONFIG_CHARGER_BQ25710) || defined(CONFIG_CHARGER_ISL9238) charge_ma = (charge_ma * 95) / 100; #endif charge_set_input_current_limit(MAX(charge_ma, diff --git a/baseboard/octopus/baseboard.h b/baseboard/octopus/baseboard.h index 264e62c38e..a20b7bc8de 100644 --- a/baseboard/octopus/baseboard.h +++ b/baseboard/octopus/baseboard.h @@ -128,6 +128,14 @@ */ #undef CONFIG_EXTPOWER_DEBOUNCE_MS #define CONFIG_EXTPOWER_DEBOUNCE_MS 50 +#elif defined(CONFIG_CHARGER_RUNTIME_CONFIG) + #define CONFIG_CHARGER_ISL9238 + #define CONFIG_CHARGER_BQ25710 + #define CONFIG_CHARGER_SENSE_RESISTOR_AC_ISL9238 20 + #define CONFIG_CHARGER_SENSE_RESISTOR_AC_BQ25710 10 + + #undef CONFIG_EXTPOWER_DEBOUNCE_MS + #define CONFIG_EXTPOWER_DEBOUNCE_MS 200 #else #error Must define a VARIANT_OCTOPUS_CHARGER #endif /* VARIANT_OCTOPUS_CHARGER */ |