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 /board/casta | |
| 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 'board/casta')
| -rw-r--r-- | board/casta/board.c | 25 | ||||
| -rw-r--r-- | board/casta/board.h | 3 |
2 files changed, 26 insertions, 2 deletions
diff --git a/board/casta/board.c b/board/casta/board.c index 700a99d284..bdedbdd1a3 100644 --- a/board/casta/board.c +++ b/board/casta/board.c @@ -8,11 +8,14 @@ #include "adc.h" #include "adc_chip.h" #include "battery.h" +#include "cbi_ssfc.h" #include "charge_manager.h" #include "charge_state.h" #include "common.h" #include "cros_board_info.h" #include "driver/charger/bd9995x.h" +#include "driver/charger/bq25710.h" +#include "driver/charger/isl923x.h" #include "driver/ppc/nx20p348x.h" #include "driver/tcpm/anx7447.h" #include "driver/tcpm/ps8xxx.h" @@ -87,6 +90,16 @@ const struct temp_sensor_t temp_sensors[] = { }; BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT); +/* Charger config. Start i2c address at isl9238, update during runtime */ +struct charger_config_t chg_chips[] = { + { + .i2c_port = I2C_PORT_CHARGER, + .i2c_addr_flags = ISL923X_ADDR_FLAGS, + .drv = &isl923x_drv, + }, +}; +const unsigned int chg_cnt = ARRAY_SIZE(chg_chips); + /* * I2C callbacks to ensure bus free time for battery I2C transactions is at * least 5ms. @@ -141,7 +154,17 @@ static void cbi_init(void) sku_id = val; CPRINTS("SKU: %d", sku_id); } -DECLARE_HOOK(HOOK_INIT, cbi_init, HOOK_PRIO_INIT_I2C + 1); +DECLARE_HOOK(HOOK_INIT, cbi_init, HOOK_PRIO_INIT_I2C); + +static void board_init(void) +{ + if(get_cbi_ssfc_charger() != SSFC_CHARGER_BQ25710) + return; + + chg_chips[0].drv = &bq25710_drv; + chg_chips[0].i2c_addr_flags = BQ25710_SMBUS_ADDR1_FLAGS; +} +DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_INIT_I2C); void board_overcurrent_event(int port, int is_overcurrented) { diff --git a/board/casta/board.h b/board/casta/board.h index 7f934dc4c6..fa2c8fb535 100644 --- a/board/casta/board.h +++ b/board/casta/board.h @@ -10,9 +10,9 @@ /* Select Baseboard features */ #define VARIANT_OCTOPUS_EC_NPCX796FB -#define VARIANT_OCTOPUS_CHARGER_ISL9238 #define VARIANT_OCTOPUS_TCPC_0_PS8751 #define VARIANT_OCTOPUS_NO_SENSORS +#define CONFIG_CHARGER_RUNTIME_CONFIG #include "baseboard.h" #define CONFIG_LED_COMMON @@ -57,6 +57,7 @@ #define CONFIG_STEINHART_HART_3V3_51K1_47K_4050B /* Battery W/A */ +#define CONFIG_CHARGER_BQ25710_IDCHG_LIMIT_MA 6144 #define CONFIG_CHARGER_PROFILE_OVERRIDE #define CONFIG_I2C_XFER_BOARD_CALLBACK |