diff options
| author | Jonathan Brandmeyer <jbrandmeyer@chromium.org> | 2018-09-04 13:54:21 -0600 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-09-05 16:11:11 -0700 |
| commit | 0a61685bef7501b5028c8a3b5e4d7abfe05791e2 (patch) | |
| tree | b6054992c16ab19c9e7c9c048cccab3bddd235c5 | |
| parent | 76e1d976246d90918e5f18d12d1df194b39cd90c (diff) | |
| download | chrome-ec-0a61685bef7501b5028c8a3b5e4d7abfe05791e2.tar.gz | |
Liara: Add supported batteries
These are two of the three batteries for Liara. Retain the Grunt
reference design battery for testing purposes only.
BUG=b:113823864
TEST=buildall
BRANCH=none
Change-Id: Ibfdfa08298ec142504b24477746ebb87aebc913c
Signed-off-by: Jonathan Brandmeyer <jbrandmeyer@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1204696
Reviewed-by: Jett Rink <jettrink@chromium.org>
| -rw-r--r-- | board/liara/battery.c | 76 | ||||
| -rw-r--r-- | board/liara/board.h | 5 | ||||
| -rw-r--r-- | driver/battery/bq4050.c | 4 |
3 files changed, 79 insertions, 6 deletions
diff --git a/board/liara/battery.c b/board/liara/battery.c index 9172300ed5..4749b1a517 100644 --- a/board/liara/battery.c +++ b/board/liara/battery.c @@ -32,7 +32,10 @@ * address, mask, and disconnect value need to be provided. */ const struct board_batt_params board_battery_info[] = { - /* Panasonic AP15O5L Battery Information */ + /* + * Panasonic AP15O5L battery information from the Grunt reference + * design. + */ [BATTERY_PANASONIC] = { .fuel_gauge = { .manuf_name = "PANASONIC", @@ -44,13 +47,14 @@ const struct board_batt_params board_battery_info[] = { .reg_addr = 0x0, .reg_mask = 0x4000, .disconnect_val = 0x0, - } + }, + .imbalance_mv = battery_default_imbalance_mv, }, .batt_info = { .voltage_max = 13200, .voltage_normal = 11550, /* mV */ - .voltage_min = 9000, /* mV */ - .precharge_current = 256, /* mA */ + .voltage_min = 9000, /* mV */ + .precharge_current = 256, /* mA */ .start_charging_min_c = 0, .start_charging_max_c = 50, .charging_min_c = 0, @@ -59,6 +63,70 @@ const struct board_batt_params board_battery_info[] = { .discharging_max_c = 60, }, }, + /* + * Sunwoda 02018 Battery Information for Liara. + * Gauge IC: TI BQ40Z697A + */ + [BATTERY_SUNWODA] = { + .fuel_gauge = { + .manuf_name = "Sunwoda 02018", + .ship_mode = { + .reg_addr = 0x00, + .reg_data = { 0x0010, 0x0010 }, + }, + .fet = { + .mfgacc_support = 1, + .reg_addr = 0x0000, + .reg_mask = 0x6000, + .disconnect_val = 0x6000, + }, + .imbalance_mv = battery_bq4050_imbalance_mv, + }, + .batt_info = { + .voltage_max = 13200, + .voltage_normal = 11520, /* mV */ + .voltage_min = 9000, /* mV */ + .precharge_current = 256, /* mA */ + .start_charging_min_c = 0, + .start_charging_max_c = 50, + .charging_min_c = 0, + .charging_max_c = 60, + .discharging_min_c = -20, + .discharging_max_c = 70, + }, + }, + /* + * Simplo 2018 Battery Information for Liara + * Gauge IC: TI BQ40Z695A + */ + [BATTERY_SIMPLO] = { + .fuel_gauge = { + .manuf_name = "SMP 2018", + .ship_mode = { + .reg_addr = 0x00, + .reg_data = { 0x0010, 0x0010 }, + }, + .fet = { + .mfgacc_support = 1, + .reg_addr = 0x0000, + .reg_mask = 0x6000, + .disconnect_val = 0x6000, + }, + .imbalance_mv = battery_bq4050_imbalance_mv, + }, + .batt_info = { + .voltage_max = 13200, + .voltage_normal = 11520, /* mV */ + .voltage_min = 9000, /* mV */ + .precharge_current = 256, /* mA */ + .start_charging_min_c = 0, + .start_charging_max_c = 50, + .charging_min_c = 0, + .charging_max_c = 60, + .discharging_min_c = -20, + .discharging_max_c = 70, + }, + }, }; BUILD_ASSERT(ARRAY_SIZE(board_battery_info) == BATTERY_TYPE_COUNT); diff --git a/board/liara/board.h b/board/liara/board.h index 6ed99a09d1..e6cf8e0056 100644 --- a/board/liara/board.h +++ b/board/liara/board.h @@ -41,6 +41,9 @@ /* KB backlight driver */ #define CONFIG_LED_DRIVER_LM3630A +#define CONFIG_BATTERY_BQ4050 +#define CONFIG_BATTERY_MEASURE_IMBALANCE + #ifndef __ASSEMBLER__ enum pwm_channel { @@ -52,6 +55,8 @@ enum pwm_channel { enum battery_type { BATTERY_PANASONIC, + BATTERY_SUNWODA, + BATTERY_SIMPLO, BATTERY_TYPE_COUNT, }; diff --git a/driver/battery/bq4050.c b/driver/battery/bq4050.c index 6f2890ff2d..684ade47e6 100644 --- a/driver/battery/bq4050.c +++ b/driver/battery/bq4050.c @@ -2,8 +2,8 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * - * Smart battery driver for TI BQ4050 family, including BQ40Z50 (and -R1, -R2) - * and BQ40Z552. + * Smart battery driver for TI BQ4050 family, including BQ40Z50 (and -R1, -R2), + * BQ40Z552, and BQ40Z60. */ #include "battery_smart.h" |