diff options
author | Ben Chen <ben.chen2@quanta.corp-partner.google.com> | 2021-01-20 16:03:44 +0800 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2021-01-23 02:57:57 +0000 |
commit | 70dda8714dd372c72d875d681460d0f8425db7e0 (patch) | |
tree | db69b00e9ea94b314f5d137b3014b62ceb32dc72 | |
parent | 741fa015ca9642ae0928178f95a3fe08bded520c (diff) | |
download | chrome-ec-70dda8714dd372c72d875d681460d0f8425db7e0.tar.gz |
voxel: add new batteryand remove the unused battery
add new battery AP18C8K, and remove battery L17L3PB0
BUG=b:177969026
BRANCH=cros/main
TEST=Make sure battery can cutoff by console "cutoff" or "ectool cutoff"
Change-Id: I7fc44eb8cad3e2d804040210571562076b1ac601
Signed-off-by: Ben Chen <ben.chen2@quanta.corp-partner.google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2639420
Reviewed-by: Keith Short <keithshort@chromium.org>
-rw-r--r-- | board/voxel/battery.c | 47 | ||||
-rw-r--r-- | board/voxel/board.h | 2 |
2 files changed, 25 insertions, 24 deletions
diff --git a/board/voxel/battery.c b/board/voxel/battery.c index 4d314150e2..8ec7c69689 100644 --- a/board/voxel/battery.c +++ b/board/voxel/battery.c @@ -44,6 +44,8 @@ const struct board_batt_params board_battery_info[] = { .reg_addr = 0x43, .reg_mask = 0x0001, .disconnect_val = 0x0, + .cfet_mask = 0x0002, + .cfet_off_val = 0x0000, } }, .batt_info = { @@ -59,37 +61,36 @@ const struct board_batt_params board_battery_info[] = { .discharging_max_c = 75, }, }, - /* LGC\011 L17L3PB0 Battery Information */ - /* - * Battery info provided by ODM on b/143477210, comment #11 - */ - [BATTERY_LGC011] = { + /* LGC AP18C8K Battery Information */ + [BATTERY_LGC_AP18C8K] = { .fuel_gauge = { - .manuf_name = "LGC", + .manuf_name = "LGC KT0030G020", .ship_mode = { - .reg_addr = 0x00, - .reg_data = { 0x10, 0x10 }, + .reg_addr = 0x3A, + .reg_data = { 0xC574, 0xC574 }, }, .fet = { - .reg_addr = 0x0, - .reg_mask = 0x6000, - .disconnect_val = 0x6000, - } + .reg_addr = 0x43, + .reg_mask = 0x0001, + .disconnect_val = 0x0, + .cfet_mask = 0x0002, + .cfet_off_val = 0x0000, + }, }, .batt_info = { - .voltage_max = TARGET_WITH_MARGIN(13200, 5), - .voltage_normal = 11550, /* mV */ - .voltage_min = 9000, /* mV */ - .precharge_current = 256, /* mA */ - .start_charging_min_c = 0, - .start_charging_max_c = 45, - .charging_min_c = 0, - .charging_max_c = 60, - .discharging_min_c = 0, - .discharging_max_c = 75, + .voltage_max = 13050, + .voltage_normal = 11250, + .voltage_min = 9000, + .precharge_current = 256, + .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 = 75, }, }, }; BUILD_ASSERT(ARRAY_SIZE(board_battery_info) == BATTERY_TYPE_COUNT); -const enum battery_type DEFAULT_BATTERY_TYPE = BATTERY_LGC011; +const enum battery_type DEFAULT_BATTERY_TYPE = BATTERY_AP19B8M; diff --git a/board/voxel/board.h b/board/voxel/board.h index b3e0b1d9e3..6478644b18 100644 --- a/board/voxel/board.h +++ b/board/voxel/board.h @@ -170,7 +170,7 @@ enum battery_type { BATTERY_AP19B8M, - BATTERY_LGC011, + BATTERY_LGC_AP18C8K, BATTERY_TYPE_COUNT, }; |