From 58320a72e4fa714c684c33337c31b4405417d717 Mon Sep 17 00:00:00 2001 From: Michael5 Chen Date: Mon, 2 Nov 2020 15:24:05 +0800 Subject: shuboz: Config the EC battery setting. Config the EC battery setting depend on battery spec. BUG=b:172182110 BRANCH=none TEST=make BOARD=shuboz Signed-off-by: Michael5 Chen Change-Id: I40323cf432c8ba379f5f644f9386640aa8355893 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2513412 Reviewed-by: Isaac Lee Reviewed-by: Denis Brockus Reviewed-by: Paul Fagerburg Reviewed-by: Peter Marheine Reviewed-by: Bhanu Prakash Maiya --- board/shuboz/battery.c | 88 +++++++++----------------------------------------- board/shuboz/board.c | 14 -------- board/shuboz/board.h | 4 +-- 3 files changed, 16 insertions(+), 90 deletions(-) diff --git a/board/shuboz/battery.c b/board/shuboz/battery.c index b5cccdd9cf..7372708305 100644 --- a/board/shuboz/battery.c +++ b/board/shuboz/battery.c @@ -32,93 +32,35 @@ * address, mask, and disconnect value need to be provided. */ const struct board_batt_params board_battery_info[] = { - /* SMP L19M3PG1 */ - [BATTERY_SMP] = { + /* CM1500 50Wh */ + [BATTERY_CM1500] = { .fuel_gauge = { - .manuf_name = "SMP", - .device_name = "L19M3PG1", + .manuf_name = "AS3GXXD3KB", + .device_name = "C140243", .ship_mode = { - .reg_addr = 0x34, - .reg_data = { 0x0000, 0x1000 }, + .reg_addr = 0x00, + .reg_data = { 0x0010, 0x0010 }, }, .fet = { - .reg_addr = 0x34, - .reg_mask = 0x0100, - .disconnect_val = 0x0100, + .reg_addr = 0x99, + .reg_mask = 0x000c, + .disconnect_val = 0x000c, } }, .batt_info = { .voltage_max = 13200, /* mV */ - .voltage_normal = 11520, /* mV */ + .voltage_normal = 11880, /* mV */ .voltage_min = 9000, /* mV */ - .precharge_current = 200, /* mA */ + .precharge_current = 256, /* mA */ .start_charging_min_c = 0, - .start_charging_max_c = 60, + .start_charging_max_c = 45, .charging_min_c = 0, - .charging_max_c = 50, + .charging_max_c = 60, .discharging_min_c = -20, - .discharging_max_c = 73, - }, - }, - - /* LGC L19L3PG1 */ - [BATTERY_LGC] = { - .fuel_gauge = { - .manuf_name = "LGC", - .device_name = "L19L3PG1", - .ship_mode = { - .reg_addr = 0x34, - .reg_data = { 0x0000, 0x1000 }, - }, - .fet = { - .reg_addr = 0x34, - .reg_mask = 0x0100, - .disconnect_val = 0x0100, - } - }, - .batt_info = { - .voltage_max = 13200, /* mV */ - .voltage_normal = 11550, /* mV */ - .voltage_min = 9000, /* mV */ - .precharge_current = 200, /* mA */ - .start_charging_min_c = 0, - .start_charging_max_c = 60, - .charging_min_c = 0, - .charging_max_c = 50, - .discharging_min_c = -20, - .discharging_max_c = 73, - }, - }, - - /* Celxpert L19C3PG1 */ - [BATTERY_CEL] = { - .fuel_gauge = { - .manuf_name = "Celxpert", - .device_name = "L19C3PG1", - .ship_mode = { - .reg_addr = 0x34, - .reg_data = { 0x0000, 0x1000 }, - }, - .fet = { - .reg_addr = 0x34, - .reg_mask = 0x0100, - .disconnect_val = 0x0100, - } - }, - .batt_info = { - .voltage_max = 13200, /* mV */ - .voltage_normal = 11520, /* mV */ - .voltage_min = 9000, /* mV */ - .precharge_current = 200, /* mA */ - .start_charging_min_c = 0, - .start_charging_max_c = 60, - .charging_min_c = 0, - .charging_max_c = 50, - .discharging_min_c = -20, - .discharging_max_c = 70, + .discharging_max_c = 60, }, }, }; BUILD_ASSERT(ARRAY_SIZE(board_battery_info) == BATTERY_TYPE_COUNT); -const enum battery_type DEFAULT_BATTERY_TYPE = BATTERY_SMP; +const enum battery_type DEFAULT_BATTERY_TYPE = BATTERY_CM1500; diff --git a/board/shuboz/board.c b/board/shuboz/board.c index 61560c4dd4..61eecd6c88 100644 --- a/board/shuboz/board.c +++ b/board/shuboz/board.c @@ -650,17 +650,3 @@ int usb_port_enable[USBA_PORT_COUNT] = { IOEX_EN_USB_A1_5V_DB_OPT1, }; -static void check_v0_battery(void) -{ - uint32_t board_version = 0; - - cbi_get_board_version(&board_version); - - if (board_version == 1) - I2C_PORT_BATTERY = I2C_PORT_BATTERY_V0; -} -/* - * Use HOOK_PRIO_INIT_I2C so we re-map before init_battery_type() and - * charger_chips_init() want to talk to the battery. - */ -DECLARE_HOOK(HOOK_INIT, check_v0_battery, HOOK_PRIO_INIT_I2C); diff --git a/board/shuboz/board.h b/board/shuboz/board.h index d1bfacaf1d..5e1d6b3210 100644 --- a/board/shuboz/board.h +++ b/board/shuboz/board.h @@ -83,9 +83,7 @@ enum adc_channel { }; enum battery_type { - BATTERY_SMP, - BATTERY_LGC, - BATTERY_CEL, + BATTERY_CM1500, BATTERY_TYPE_COUNT, }; -- cgit v1.2.1